X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=hooks%2Flive;h=adadab37f2ff859642a32d3c428a60c22a2ffb02;hb=942a8f0a95556e1a51c9b5b0d2d67bf9709374f0;hp=a018d9530bea53a3d79983a837104bd5d3e02b2b;hpb=c967ebfc4e43fb16a0c2c140c66900712be95ab7;p=live-boot-grml.git

diff --git a/hooks/live b/hooks/live
index a018d95..adadab3 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,29 +22,20 @@ 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 ]
-then
-	. /etc/live.conf
-
-	mkdir -p "${DESTDIR}"/etc
-	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-initramfs/live-set-selections /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
@@ -69,6 +60,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)