From: Daniel Baumann <daniel@debian.org>
Date: Mon, 28 Apr 2008 11:52:55 +0000 (+0200)
Subject: Handling conflicting klibc includes with initramfs-hooks of other packages (Closes... 
X-Git-Tag: debian/2.0.15-1~549
X-Git-Url: http://git.grml.org/?a=commitdiff_plain;h=b03585bbb0f7a4e5349ca66e5cf13a74a782b9e9;hp=af4da52a0ffd882d369c23b1264b2e18ee82844d;p=live-boot-grml.git

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