X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=hooks%2Flive;h=ca2a761828fcff5b2a986665cfd275afc82301cf;hb=f82531b3971588c2fcded6fa9cfd91fb0dd72d24;hp=e692690f707351091fb3cda3f59bd5ed29d88758;hpb=f197369a2f2a0078e58b869f5884254d138e5894;p=live-boot-grml.git

diff --git a/hooks/live b/hooks/live
index e692690..ca2a761 100755
--- a/hooks/live
+++ b/hooks/live
@@ -57,6 +57,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 +74,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 unlzma
+manual_add_modules sqlzma
 
 # Filesystem: unionfs/aufs
 manual_add_modules unionfs
@@ -102,15 +114,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 +123,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