rpms/mkinitrd/F-10 mkinitrd-6.0.71-502221.patch, NONE, 1.1 mkinitrd.spec, 1.298, 1.299

[Hans de Goede]

Author: jwrdegoede

Update of /cvs/extras/rpms/mkinitrd/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv6899

Modified Files:
	mkinitrd.spec 
Added Files:
	mkinitrd-6.0.71-502221.patch 
Log Message:
* Wed May 27 2009 Hans de Goede <hdegoede at redhat.com> - 6.0.71-5
- Fix mkinitrd creating a non booting initrd when parted-devel is installed
  and the user has made configuration changes resulting in ld.so searching
  /usr/lib before /lib (#


mkinitrd-6.0.71-502221.patch:

--- NEW FILE mkinitrd-6.0.71-502221.patch ---
>From 1ab476bbf20d0bf69eb7f6a81e676f7d8064a45a Mon Sep 17 00:00:00 2001
From: Hans de Goede <hdegoede at redhat.com>
Date: Mon, 25 May 2009 11:33:04 +0200
Subject: [PATCH] mkinitrd install symlink target from target dir not symlink dir (#502221)

When installing symlink targets we were telling cp to read the target
from the dir where the symlink lives, instead of from the dir where the
target actually lives. This becomes a problem when those dirs are not the
same.

This was triggered by having parted-devel installed, which after
having run ldconfig once results in a /usr/lib[64]/libparted-1.8.so.8
symlink, where as parted lives under /lib[64], in combination with
having /usr/lib[64] in /etc/ld.so.conf .
---
 functions |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/functions b/functions
index 5228a3f..2fe61da 100644
--- a/functions
+++ b/functions
@@ -162,11 +162,6 @@ function inst() {
             ln -sf "$target" "$root$dest"
             #inst "$target" "$root"
             local BASE=`basename "$target"`
-            local LIBDIR=`echo "$file" | sed -e 's,\(\(.*\)/\)[^/]\+$,\1,'`
-            if [ "$LIBDIR" = "$BASE" ]; then
-                local LIBDIR=`echo "/$dest" | sed -e 's,\(\(.*\)/\)[^/]\+$,\1,'`
-            fi
-
             local TLIBDIR=`echo "$target" | sed -e 's,\(^/lib[^/]*\)/.*$,\1/,' \
                                                 -e 's,\(\(.*\)/\)[^/]\+$,\1,'`
             if [ "$TLIBDIR" = "$BASE" ]; then
@@ -175,7 +170,7 @@ function inst() {
                                                 -e 's,\(\(.*\)/\)[^/]\+$,\1,'`
             fi
 
-            inst "$LIBDIR/$BASE" "$root" "$TLIBDIR/$BASE"
+            inst "$TLIBDIR/$BASE" "$root" "$TLIBDIR/$BASE"
             RET=$?
             IF_indent_chars=${old_indent_chars}
             return $RET
-- 
1.6.2.2



Index: mkinitrd.spec
===================================================================
RCS file: /cvs/extras/rpms/mkinitrd/F-10/mkinitrd.spec,v
retrieving revision 1.298
retrieving revision 1.299
diff -u -p -r1.298 -r1.299
--- mkinitrd.spec	12 Feb 2009 10:41:51 -0000	1.298
+++ mkinitrd.spec	27 May 2009 13:24:08 -0000	1.299
@@ -3,7 +3,7 @@
 Summary: Creates an initial ramdisk image for preloading modules.
 Name: mkinitrd
 Version: 6.0.71
-Release: 4%{?dist}
+Release: 5%{?dist}
 License: GPLv2+
 Group: System Environment/Base
 Source0: mkinitrd-%{version}.tar.bz2
@@ -13,6 +13,7 @@ Patch0: mkinitrd-6.0.71-scsi_wait_scan.p
 Patch1: mkinitrd-6.0.71-do-not-use-resolve_dm_name.patch
 Patch2: mkinitrd-6.0.71-480667.patch
 Patch3: mkinitrd-6.0.71-relatime.patch
+Patch4: mkinitrd-6.0.71-502221.patch
 ExclusiveOs: Linux
 URL: git://git.fedoraproject.org/git/hosted/mkinitrd
 Requires: /bin/sh, /sbin/insmod.static, /sbin/losetup
@@ -76,6 +77,7 @@ nash shell used by initrd
 %patch1 -p1
 %patch2 -p1
 %patch3 -p1
+%patch4 -p1
 find . -name "Makefile*" -exec sed -i 's|-Werror||g' {} \;
 
 %build
@@ -130,6 +132,11 @@ rm -rf $RPM_BUILD_ROOT
 %dir %{_sysconfdir}/kernel/prerm.d
 
 %changelog
+* Wed May 27 2009 Hans de Goede <hdegoede at redhat.com> - 6.0.71-5
+- Fix mkinitrd creating a non booting initrd when parted-devel is installed
+  and the user has made configuration changes resulting in ld.so searching
+  /usr/lib before /lib (#
+
 * Thu Feb 12 2009 Hans de Goede <hdegoede at redhat.com> - 6.0.71-4
 - Do not call dm_resolve_name on dmraidsets names, sometimes it fails, and
   it is not necessary, this fixes the dmraid boot failure seen on