Adding upstream version 1.118.1.

[live-boot-grml.git] / hooks / live

diff --git a/hooks/live b/hooks/live
index 2e83ab2..c18dfc2 100755 (executable)
--- 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,17 @@ 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
 
-# Filesystem: unionfs
+# Filesystem: unionfs/aufs
 manual_add_modules unionfs
+manual_add_modules aufs
 
 # Filesystem: vfat
 manual_add_modules nls_cp437
@@ -98,16 +108,16 @@ then
        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
+
+# Program: wget
+if [ -x /usr/bin/wget ]
+then
+       copy_exec /usr/bin/wget /bin
+fi