[SCM] debian-live/live-initramfs branch, master, updated. 1.130.1-3-2-g7967a57

[Daniel Baumann]

The following commit has been merged in the master branch:
commit 7967a57a2fe3d1bdae3a52a73c2abeb467be16cd
Author: Daniel Baumann <daniel at debian.org>
Date:   Mon Apr 28 13:52:55 2008 +0200

    Handling conflicting klibc includes with initramfs-hooks of other packages (Closes: 475783).

diff --git a/hooks/live b/hooks/live
index e653aef..b85f646 100755
--- a/hooks/live
+++ b/hooks/live
@@ -47,11 +47,11 @@ cp /usr/share/initramfs-tools/scripts/live-functions "${DESTDIR}"/scripts
 cp /usr/share/initramfs-tools/scripts/live-helpers "${DESTDIR}"/scripts
 
 # klibc dependencies
-for hidden_klibc_dep_library in libacl libblkid libuuid libdevmapper libattr
+for FILE in /lib/libacl* /lib/libblkid* /lib/libuuid* /lib/libdevmapper* /lib/libattr*
 do
-	if ls /lib/${hidden_klibc_dep_library}.so.* > /dev/null 2>&1
+	if [ ! -e "${DESTDIR}"/"${FILE}" ]
 	then
-		cp -a /lib/${hidden_klibc_dep_library}.so.* "${DESTDIR}"/lib
+		cp -a "${FILE}" "${DESTDIR}"/"${FILE}"
 	fi
 done
 

-- 
debian-live/live-initramfs