Merging casper 1.230.

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

diff --git a/hooks/live b/hooks/live
index b286f6e..afa198d 100755 (executable)
--- a/hooks/live
+++ b/hooks/live
@@ -44,6 +44,7 @@ mkdir -p "${DESTDIR}"/lib/live-initramfs
 # Executables
 copy_exec /usr/share/live-initramfs/live-reconfigure /bin
 copy_exec /usr/share/live-initramfs/live-preseed /bin
+copy_exec /usr/share/live-initramfs/live-set-selections /bin
 
 # Scripts
 cp /usr/share/initramfs-tools/scripts/live-functions "${DESTDIR}"/scripts
@@ -61,12 +62,19 @@ done
 # udev dependencies (squeeze and newer)
 for FILE in /lib/udev/*_id
 do
-       if [ ! -e "${DESTDIR}"/"${FILE}" ]
+       if [ ! -e "${DESTDIR}/${FILE}" ]
        then
-               copy_exec "${FILE}" /lib/udev/
+               mkdir -p "${DESTDIR}/lib/udev"
+               copy_exec "${FILE}" /lib/udev
        fi
 done
 
+if [ -e /lib/udev/rules.d/60-cdrom_id.rules ]
+then
+       mkdir -p ${DESTDIR}/lib/udev/rules.d
+       cp -p /lib/udev/rules.d/60-cdrom_id.rules ${DESTDIR}/lib/udev/rules.d
+fi
+
 # Handling other stuff
 
 # Configuration: keymap (usefull when using encryption)
@@ -99,6 +107,11 @@ manual_add_modules ext4
 # Filesystem: jffs2
 manual_add_modules jffs2
 
+if [ -x /usr/bin/rsync ]
+then
+       copy_exec /usr/bin/rsync /bin
+fi
+
 # Filesystem: squashfs
 copy_exec /sbin/losetup /sbin
 manual_add_modules loop
@@ -110,6 +123,12 @@ manual_add_modules unlzma
 manual_add_modules aufs
 manual_add_modules unionfs
 
+# Filesystem: unionfs-fuse
+if [ -x /usr/bin/unionfs-fuse ]
+then
+       copy_exec /usr/bin/unionfs-fuse /bin
+fi
+
 # Filesystem: vfat
 manual_add_modules nls_cp437
 manual_add_modules nls_iso8859-1
@@ -171,6 +190,12 @@ then
        copy_exec /usr/bin/wget /bin
 fi
 
+# Program: blockdev
+if [ -x /sbin/blockdev ]
+then
+       copy_exec /sbin/blockdev /sbin
+fi
+
 # FUSE kernel module
 manual_add_modules fuse