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

diff --git a/hooks/live b/hooks/live
index d47e6e9..ca2a761 100755
--- a/hooks/live
+++ b/hooks/live
@@ -39,7 +39,6 @@ fi
 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
 
@@ -58,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
@@ -68,13 +74,19 @@ 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
+# Filesystem: unionfs/aufs
 manual_add_modules unionfs
+manual_add_modules aufs
 
 # Filesystem: vfat
 manual_add_modules nls_cp437
@@ -84,6 +96,7 @@ manual_add_modules vfat
 
 # Hardware: cdrom
 manual_add_modules ide-cd
+manual_add_modules ide-generic
 manual_add_modules ohci1394
 manual_add_modules sbp2
 manual_add_modules sr_mod
@@ -92,18 +105,21 @@ manual_add_modules sr_mod
 auto_add_modules net
 
 # Program: eject
-copy_exec /usr/bin/eject /bin
-
-# Program: udev
-if [ "${BUILD_SYSTEM}" = "Ubuntu" ]
+if [ -x /usr/bin/eject ]
 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
+	copy_exec /usr/bin/eject /bin
 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
+
+# Program: wget
+if [ -x /usr/bin/wget ]
+then
+	copy_exec /usr/bin/wget /bin
+fi