X-Git-Url: http://git.grml.org/?a=blobdiff_plain;ds=sidebyside;f=hooks%2Fcasper;h=2ebd18867daab3c861c68b88915b99273bdf249a;hb=269ea83c30e08ac2f82cea67b5d6ac065a67cbef;hp=191f2f52733a2fdaf737c5fc2a4bbfd7d84bc8d8;hpb=a4a7503df76005df67b006e1324004c808830c32;p=live-boot-grml.git

diff --git a/hooks/casper b/hooks/casper
index 191f2f5..2ebd188 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
-#	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
-# FIXME: add lsb check for ubuntu
+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
@@ -78,4 +84,6 @@ manual_add_modules ohci1394
 # integrity check
 copy_exec /usr/lib/casper/casper-md5check /bin
 
+cp /usr/share/initramfs-tools/scripts/casper-functions $DESTDIR/scripts
+
 auto_add_modules net