X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=hooks%2Flive;h=8cfc360211dbd2965ba097bf5bfe7a791b3e03dc;hb=8cda0af62cb4b0c60f7f775c56b7fd2502b075a8;hp=e94590da7c31559c4a5190f2f58b881864dce4b6;hpb=9eaf880cb1944045bac06758a0a7a68ea734595c;p=live-boot-grml.git

diff --git a/hooks/live b/hooks/live
index e94590d..8cfc360 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
@@ -73,8 +79,9 @@ copy_exec /sbin/losetup /sbin
 manual_add_modules loop
 manual_add_modules squashfs
 
-# Filesystem: unionfs
+# Filesystem: unionfs/aufs
 manual_add_modules unionfs
+manual_add_modules aufs
 
 # Filesystem: vfat
 manual_add_modules nls_cp437
@@ -83,8 +90,8 @@ manual_add_modules nls_utf8
 manual_add_modules vfat
 
 # Hardware: cdrom
-force_load ide-generic
 manual_add_modules ide-cd
+manual_add_modules ide-generic
 manual_add_modules ohci1394
 manual_add_modules sbp2
 manual_add_modules sr_mod
@@ -93,7 +100,13 @@ manual_add_modules sr_mod
 auto_add_modules net
 
 # Program: eject
-copy_exec /usr/bin/eject /bin
+if [ -x /usr/bin/eject ]
+then
+	copy_exec /usr/bin/eject /bin
+fi
+
+# Program: md5sum
+copy_exec /usr/bin/md5sum /bin
 
 # Program: udev
 if [ "${BUILD_SYSTEM}" = "Ubuntu" ]
@@ -108,3 +121,9 @@ fi
 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