X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=hooks%2Fcasper;h=f7fee12dc7ae79816d4bd36abf80ce8c6f953cfd;hb=b20c029242be0736ebad66870076fbd0f46b2274;hp=7229612953848565a02b8ab1c511ae38d6787359;hpb=4a0b1ba4d428c623d14bae7f0db85c80abb0da0a;p=live-boot-grml.git

diff --git a/hooks/casper b/hooks/casper
index 7229612..f7fee12 100755
--- a/hooks/casper
+++ b/hooks/casper
@@ -18,15 +18,21 @@ esac
 
 . /usr/share/initramfs-tools/hook-functions
 
-
 manual_add_modules unionfs
 
+# Copy in casper.conf
+if [ -e /etc/casper.conf ]; then
+    . /etc/casper.conf
+    mkdir -p ${DESTDIR}/etc
+    cp /etc/casper.conf ${DESTDIR}/etc
+fi
+
 # Needed for devmapper
 if [ -e /sbin/dmsetup ]; then
-	manual_add_modules cloop
-	copy_exec /sbin/blockdev /sbin
-	copy_exec /sbin/dmsetup /sbin
-	manual_add_modules dm-snapshot
+    manual_add_modules cloop
+    copy_exec /sbin/blockdev /sbin
+    copy_exec /sbin/dmsetup /sbin
+    manual_add_modules dm-snapshot
 fi
 
 # We need losetup
@@ -37,24 +43,24 @@ mkdir -p ${DESTDIR}/lib/casper
 copy_exec /usr/share/casper/casper-reconfigure /bin
 copy_exec /usr/share/casper/casper-preseed /bin
 
-# Ubuntu or Debian test
-if [ -x /sbin/udevplug ]; then
-	mkdir -p ${DESTDIR}/lib/udev
-	copy_exec /lib/udev/cdrom_id /lib/udev
-	copy_exec /lib/udev/vol_id /lib/udev
-	copy_exec /lib/udev/path_id /lib/udev
-else
-	copy_exec /sbin/udevtrigger /sbin
+if [ "${BUILD_SYSTEM}" == "Ubuntu" ]; then
+    mkdir -p ${DESTDIR}/lib/udev
+    copy_exec /lib/udev/cdrom_id /lib/udev
+    copy_exec /lib/udev/vol_id /lib/udev
+    copy_exec /lib/udev/path_id /lib/udev
 fi
 
+copy_exec /sbin/udevtrigger /sbin
+copy_exec /sbin/udevsettle /sbin
+
 copy_exec /usr/bin/udevinfo /bin
 
-# cifs boot 
+# cifs boot
 if [ -x /sbin/mount.cifs ]; then
-	copy_exec /sbin/mount.cifs /sbin
-	for x in cifs; do
-		manual_add_modules ${x}
-	done
+    copy_exec /sbin/mount.cifs /sbin
+    for x in cifs; do
+        manual_add_modules ${x}
+    done
 fi
 
 # squashfs