projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Handling conflicting klibc includes with initramfs-hooks of other packages (Closes...
[live-boot-grml.git]
/
hooks
/
live
diff --git
a/hooks/live
b/hooks/live
index
e653aef
..
b85f646
100755
(executable)
--- 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
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
do
- if
ls /lib/${hidden_klibc_dep_library}.so.* > /dev/null 2>&1
+ if
[ ! -e "${DESTDIR}"/"${FILE}" ]
then
then
- cp -a
/lib/${hidden_klibc_dep_library}.so.* "${DESTDIR}"/lib
+ cp -a
"${FILE}" "${DESTDIR}"/"${FILE}"
fi
done
fi
done