projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Handle non-existing klibc includes in live hook (Closes: #475783).
[live-boot-grml.git]
/
hooks
/
live
diff --git
a/hooks/live
b/hooks/live
index
5c00534
..
e653aef
100755
(executable)
--- a/
hooks/live
+++ b/
hooks/live
@@
-46,6
+46,15
@@
copy_exec /usr/share/live-initramfs/live-preseed /bin
cp /usr/share/initramfs-tools/scripts/live-functions "${DESTDIR}"/scripts
cp /usr/share/initramfs-tools/scripts/live-helpers "${DESTDIR}"/scripts
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
+do
+ if ls /lib/${hidden_klibc_dep_library}.so.* > /dev/null 2>&1
+ then
+ cp -a /lib/${hidden_klibc_dep_library}.so.* "${DESTDIR}"/lib
+ fi
+done
+
# Handling other stuff
# Configuration: keymap (usefull when using encryption)
# Handling other stuff
# Configuration: keymap (usefull when using encryption)
@@
-81,8
+90,8
@@
manual_add_modules jffs2
copy_exec /sbin/losetup /sbin
manual_add_modules loop
manual_add_modules squashfs
copy_exec /sbin/losetup /sbin
manual_add_modules loop
manual_add_modules squashfs
-manual_add_modules unlzma
manual_add_modules sqlzma
manual_add_modules sqlzma
+manual_add_modules unlzma
# Filesystem: unionfs/aufs
manual_add_modules unionfs
# Filesystem: unionfs/aufs
manual_add_modules unionfs
@@
-126,9
+135,3
@@
if [ -x /usr/bin/wget ]
then
copy_exec /usr/bin/wget /bin
fi
then
copy_exec /usr/bin/wget /bin
fi
-
-# Fix missing klibc deps
-for hidden_klibc_dep_library in libacl libblkid libuuid libdevmapper libattr
-do
- cp -a /lib/${hidden_klibc_dep_library}.so.* ${DESTDIR}/lib
-done