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
0ed58d8
..
e653aef
100755
(executable)
--- a/
hooks/live
+++ b/
hooks/live
@@
-39,7
+39,6
@@
fi
mkdir -p "${DESTDIR}"/lib/live-initramfs
# Executables
mkdir -p "${DESTDIR}"/lib/live-initramfs
# Executables
-copy_exec /usr/lib/live-initramfs/live-md5check /bin
copy_exec /usr/share/live-initramfs/live-reconfigure /bin
copy_exec /usr/share/live-initramfs/live-preseed /bin
copy_exec /usr/share/live-initramfs/live-reconfigure /bin
copy_exec /usr/share/live-initramfs/live-preseed /bin
@@
-47,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)
@@
-58,6
+66,13
@@
then
cp /etc/console/boottime.kmap.gz "${DESTDIR}"/etc
fi
cp /etc/console/boottime.kmap.gz "${DESTDIR}"/etc
fi
+# Configuration: Unique ID
+if [ -n "${LIVE_GENERATE_UUID}" ]
+then
+ mkdir -p "${DESTDIR}"/conf
+ uuidgen -r > "${DESTDIR}"/conf/uuid.conf
+fi
+
# Filesystem: cifs
if [ -x /sbin/mount.cifs ]
then
# Filesystem: cifs
if [ -x /sbin/mount.cifs ]
then
@@
-68,10
+83,15
@@
fi
# Filesystem: ext3
manual_add_modules ext3
# Filesystem: ext3
manual_add_modules ext3
+# Filesystem: jffs2
+manual_add_modules jffs2
+
# Filesystem: squashfs
copy_exec /sbin/losetup /sbin
manual_add_modules loop
manual_add_modules squashfs
# Filesystem: squashfs
copy_exec /sbin/losetup /sbin
manual_add_modules loop
manual_add_modules squashfs
+manual_add_modules sqlzma
+manual_add_modules unlzma
# Filesystem: unionfs/aufs
manual_add_modules unionfs
# Filesystem: unionfs/aufs
manual_add_modules unionfs
@@
-90,6
+110,9
@@
manual_add_modules ohci1394
manual_add_modules sbp2
manual_add_modules sr_mod
manual_add_modules sbp2
manual_add_modules sr_mod
+# Hardware: usb
+manual_add_modules sd_mod
+
# Hardware: network
auto_add_modules net
# Hardware: network
auto_add_modules net
@@
-99,16
+122,16
@@
then
copy_exec /usr/bin/eject /bin
fi
copy_exec /usr/bin/eject /bin
fi
-# Program: udev
-if [ "${BUILD_SYSTEM}" = "Ubuntu" ]
-then
- mkdir -p "${DESTDIR}"/lib/udev
-
- copy_exec /lib/udev/cdrom_id /lib/udev
- copy_exec /lib/udev/path_id /lib/udev
- copy_exec /lib/udev/vol_id /lib/udev
-fi
+# Program: md5sum
+copy_exec /usr/bin/md5sum /bin
+# Program: udev
copy_exec /sbin/udevtrigger /sbin
copy_exec /sbin/udevsettle /sbin
copy_exec /usr/bin/udevinfo /bin
copy_exec /sbin/udevtrigger /sbin
copy_exec /sbin/udevsettle /sbin
copy_exec /usr/bin/udevinfo /bin
+
+# Program: wget
+if [ -x /usr/bin/wget ]
+then
+ copy_exec /usr/bin/wget /bin
+fi