X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=hooks%2Flive;h=645b168d917d79e06af3501fc4c9c4caf8a47e06;hb=e66f79476042794195978ee641aa7ea0d9ca6e0a;hp=aa7b020ac9eb117f7972b7785d522b2f67c7791f;hpb=f47a93a78a4a7d45d3db17184d592895dd913a4d;p=live-boot-grml.git

diff --git a/hooks/live b/hooks/live
index aa7b020..645b168 100755
--- a/hooks/live
+++ b/hooks/live
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-# initramfs hook for live-initramfs (Debian Live)
+# initramfs hook for live-boot (Debian Live)
 
 set -e
 
@@ -22,9 +22,9 @@ esac
 
 . /usr/share/initramfs-tools/hook-functions
 
-# live-initramfs hook
+# live-boot hook
 
-# Handling live-initramfs
+# Handling live-boot
 
 # Configuration
 if [ -r /etc/live.conf ]
@@ -35,15 +35,15 @@ then
 	cp /etc/live.conf "${DESTDIR}"/etc
 fi
 
-mkdir -p "${DESTDIR}"/usr/share/live-initramfs
-cp /usr/share/live-initramfs/languagelist "${DESTDIR}"/usr/share/live-initramfs
+mkdir -p "${DESTDIR}"/usr/share/live-boot
+cp /usr/share/live-boot/languagelist "${DESTDIR}"/usr/share/live-boot
 
 # Directories
-mkdir -p "${DESTDIR}"/lib/live-initramfs
+mkdir -p "${DESTDIR}"/lib/live-boot
 
 # Executables
-copy_exec /usr/share/live-initramfs/live-reconfigure /bin
-copy_exec /usr/share/live-initramfs/live-preseed /bin
+copy_exec /usr/share/live-boot/live-reconfigure /bin
+copy_exec /usr/share/live-boot/live-preseed /bin
 
 # Scripts
 cp /usr/share/initramfs-tools/scripts/live-functions "${DESTDIR}"/scripts
@@ -68,6 +68,12 @@ do
 	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)
@@ -100,7 +106,10 @@ manual_add_modules ext4
 # Filesystem: jffs2
 manual_add_modules jffs2
 
-copy_exec /usr/bin/rsync /bin
+if [ -x /usr/bin/rsync ]
+then
+	copy_exec /usr/bin/rsync /bin
+fi
 
 # Filesystem: squashfs
 copy_exec /sbin/losetup /sbin
@@ -113,6 +122,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