X-Git-Url: http://git.grml.org/?a=blobdiff_plain;ds=sidebyside;f=hooks%2Flive;h=3552f3a950121601385ed954304318381a5d7770;hb=949eb8c66baddef83378dd677c10b02c3f23ca36;hp=e692690f707351091fb3cda3f59bd5ed29d88758;hpb=f197369a2f2a0078e58b869f5884254d138e5894;p=live-boot-grml.git

diff --git a/hooks/live b/hooks/live
index e692690..3552f3a 100755
--- a/hooks/live
+++ b/hooks/live
@@ -46,6 +46,12 @@ 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
 
+# klibc dependencies
+for hidden_klibc_dep_library in libacl libblkid libuuid libdevmapper libattr
+do
+	cp -a /lib/${hidden_klibc_dep_library}.so.* "${DESTDIR}"/lib
+done
+
 # Handling other stuff
 
 # Configuration: keymap (usefull when using encryption)
@@ -57,6 +63,13 @@ then
 	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
@@ -67,10 +80,15 @@ fi
 # 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
+manual_add_modules sqlzma
+manual_add_modules unlzma
 
 # Filesystem: unionfs/aufs
 manual_add_modules unionfs
@@ -89,6 +107,9 @@ manual_add_modules ohci1394
 manual_add_modules sbp2
 manual_add_modules sr_mod
 
+# Hardware: usb
+manual_add_modules sd_mod
+
 # Hardware: network
 auto_add_modules net
 
@@ -102,15 +123,6 @@ fi
 copy_exec /usr/bin/md5sum /bin
 
 # 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
-
 copy_exec /sbin/udevtrigger /sbin
 copy_exec /sbin/udevsettle /sbin
 copy_exec /usr/bin/udevinfo /bin
@@ -120,9 +132,3 @@ if [ -x /usr/bin/wget ]
 then
 	copy_exec /usr/bin/wget /bin
 fi
-
-if [ "$CASPER_GENERATE_UUID" ]; then
-    # Unique ID
-    mkdir -p $DESTDIR/conf
-    uuidgen -r > $DESTDIR/conf/uuid.conf
-fi