Adding upstream version 1.91.1.

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

diff --git a/hooks/live b/hooks/live
index 402f7ca..a2e5943 100755 (executable)
--- a/hooks/live
+++ b/hooks/live
@@ -47,39 +47,21 @@ 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
 
-# Handling binaries
+# Handling other stuff
 
-# losetup
-copy_exec /sbin/losetup /sbin
-
-# mount.cifs
-if [ -x /sbin/mount.cifs ]
-then
-       copy_exec /sbin/mount.cifs /sbin
-fi
-
-# eject
-copy_exec /usr/bin/eject /bin
-
-# udev
-if [ "${BUILD_SYSTEM}" = "Ubuntu" ]
+# Configuration: keymap (usefull when using encryption)
+if [ -x /bin/loadkeys ] && [ -r /etc/console/boottime.kmap.gz ]
 then
-       mkdir -p "${DESTDIR}"/lib/udev
+       copy_exec /bin/loadkeys /bin
 
-       copy_exec /lib/udev/cdrom_id /lib/udev
-       copy_exec /lib/udev/path_id /lib/udev
-       copy_exec /lib/udev/vol_id /lib/udev
+       mkdir -p "${DESTDIR}"/etc
+       cp /etc/console/boottime.kmap.gz "${DESTDIR}"/etc
 fi
 
-copy_exec /sbin/udevtrigger /sbin
-copy_exec /sbin/udevsettle /sbin
-copy_exec /usr/bin/udevinfo /bin
-
-# Handling kernel modules
-
 # Filesystem: cifs
 if [ -x /sbin/mount.cifs ]
 then
+       copy_exec /sbin/mount.cifs /sbin
         manual_add_modules cifs
 fi
 
@@ -87,6 +69,7 @@ fi
 manual_add_modules ext3
 
 # Filesystem: squashfs
+copy_exec /sbin/losetup /sbin
 manual_add_modules loop
 manual_add_modules squashfs
 
@@ -101,6 +84,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
@@ -108,11 +92,19 @@ manual_add_modules sr_mod
 # Hardware: network
 auto_add_modules net
 
-# Custom keymap (usefull when using encryption)
-if [ -x /bin/loadkeys ] && [ -r /etc/console/boottime.kmap.gz ]
+# Program: eject
+copy_exec /usr/bin/eject /bin
+
+# Program: udev
+if [ "${BUILD_SYSTEM}" = "Ubuntu" ]
 then
-       copy_exec /bin/loadkeys /bin
+       mkdir -p "${DESTDIR}"/lib/udev
 
-       mkdir -p "${DESTDIR}"/etc
-       cp /etc/console/boottime.kmap.gz "${DESTDIR}"/etc
+       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