X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=hooks%2Flive;h=32adfb6602c20316603daf7e9f02305447d097b2;hb=refs%2Ftags%2Fupstream%2F1.156.1;hp=4c72f0b968af59e77a1ccf4789e75165372a132c;hpb=b5307f7e721586c8cb062fbb8004a2aec1301a74;p=live-boot-grml.git

diff --git a/hooks/live b/hooks/live
index 4c72f0b..32adfb6 100755
--- a/hooks/live
+++ b/hooks/live
@@ -80,8 +80,9 @@ then
         manual_add_modules cifs
 fi
 
-# Filesystem: ext3
+# Filesystem: ext3/ext4
 manual_add_modules ext3
+manual_add_modules ext4
 
 # Filesystem: jffs2
 manual_add_modules jffs2
@@ -103,6 +104,9 @@ manual_add_modules nls_iso8859-1
 manual_add_modules nls_utf8
 manual_add_modules vfat
 
+# Filesystem: ntfs
+manual_add_modules ntfs
+
 # Hardware: cdrom
 manual_add_modules ide-cd
 manual_add_modules ide-generic
@@ -125,9 +129,25 @@ fi
 # Program: md5sum
 copy_exec /usr/bin/md5sum /bin
 
+# Program: cpio
+# busybox and klibc lacks --no-absolute-filenames and --sparse, needed for snapshots
+if [ -e "${DESTDIR}/bin/cpio" ]
+then
+	# Override already present cpio's, mostly klibc's
+	rm "${DESTDIR}/bin/cpio"
+fi
+copy_exec /bin/cpio /bin
+
 # Program: udev
-copy_exec /sbin/udevadm /sbin
-copy_exec /sbin/udevsettle /sbin
+if [ -x /sbin/udevadm ]
+then
+	# lenny
+	copy_exec /sbin/udevadm /sbin
+else
+	# etch
+	copy_exec /sbin/udevtrigger /sbin
+	copy_exec /sbin/udevsettle /sbin
+fi
 copy_exec /usr/bin/udevinfo /bin
 
 # Program: wget
@@ -139,15 +159,13 @@ fi
 # FUSE kernel module
 manual_add_modules fuse
 
-# FUSE filesystem: httpfs
-if [ -x /usr/bin/httpfs_ssl ]
+# FUSE filesystem: httpfs2
+if [ -x /usr/bin/httpfs2_ssl ]
 then
 	copy_exec /usr/bin/httpfs2_ssl /bin/httpfs
-else
-	if [ -x /usr/bin/httpfs ]
-	then
-		copy_exec /usr/bin/httpfs2 /bin/httpfs
-	fi
+elif [ -x /usr/bin/httpfs2 ]
+then
+	copy_exec /usr/bin/httpfs2 /bin/httpfs
 fi
 
 # FUSE filesystem: curlftpfs
@@ -155,4 +173,3 @@ if [ -x /usr/bin/curlftpfs ]
 then
 	copy_exec /usr/bin/curlftpfs /bin
 fi
-