X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=hooks%2Fcasper;h=be7f95925289ad26835b592cc1006dd9dbd54795;hb=0a8e85ff66e30694a0583614f0ae90c36e8d44f6;hp=8779944cce5d0d38d64ede6c7e0d774e8a74f56b;hpb=a7e62470dcdcd93501d9f54a96ca45d267ad1fe5;p=live-boot-grml.git

diff --git a/hooks/casper b/hooks/casper
index 8779944..be7f959 100755
--- a/hooks/casper
+++ b/hooks/casper
@@ -18,10 +18,15 @@ esac
 
 . /usr/share/initramfs-tools/hook-functions
 
-# cloop is needed
-manual_add_modules cloop
 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
+
 # We need losetup
 copy_exec /sbin/losetup /sbin
 
@@ -30,16 +35,25 @@ mkdir -p ${DESTDIR}/lib/casper
 copy_exec /usr/share/casper/casper-reconfigure /bin
 copy_exec /usr/share/casper/casper-preseed /bin
 
-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
+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
 
-# Needed for devmapper
-copy_exec /sbin/blockdev /sbin
-copy_exec /sbin/dmsetup /sbin
-manual_add_modules dm-snapshot
+# cifs boot
+if [ -x /sbin/mount.cifs ]; then
+    copy_exec /sbin/mount.cifs /sbin
+    for x in cifs; do
+        manual_add_modules ${x}
+    done
+fi
 
 # squashfs
 manual_add_modules squashfs
@@ -62,4 +76,7 @@ manual_add_modules ohci1394
 # integrity check
 copy_exec /usr/lib/casper/casper-md5check /bin
 
+cp /usr/share/initramfs-tools/scripts/casper-functions $DESTDIR/scripts
+cp /usr/share/initramfs-tools/scripts/casper-helpers $DESTDIR/scripts
+
 auto_add_modules net