X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=hooks%2Flive;h=8a1be0278b68c253d5c517b529da8a4dd14d3fc1;hb=c6e3f250dd26f951f32a34a18e7153a7a5d340a9;hp=56425ad80aac3c8a15ede13f019604b620bfff38;hpb=eedba054799e9809e7178938e372ece8c58d15c9;p=live-boot-grml.git

diff --git a/hooks/live b/hooks/live
index 56425ad..8a1be02 100755
--- a/hooks/live
+++ b/hooks/live
@@ -93,9 +93,9 @@ manual_add_modules squashfs
 manual_add_modules sqlzma
 manual_add_modules unlzma
 
-# Filesystem: unionfs/aufs
-manual_add_modules unionfs
+# Filesystem: aufs/unionfs
 manual_add_modules aufs
+manual_add_modules unionfs
 
 # Filesystem: vfat
 manual_add_modules nls_cp437
@@ -103,6 +103,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,11 +128,30 @@ 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/udevtrigger /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: wc
+copy_exec /usr/bin/wc /bin
+
 # Program: wget
 if [ -x /usr/bin/wget ]
 then
@@ -139,15 +161,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 +175,3 @@ if [ -x /usr/bin/curlftpfs ]
 then
 	copy_exec /usr/bin/curlftpfs /bin
 fi
-