X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=hooks%2Flive;h=190fac5a793cdb62b09007c055403fcf9f9a647c;hb=97a04033aa1534bd62aa0bbf4e83c79c9827f1ec;hp=56425ad80aac3c8a15ede13f019604b620bfff38;hpb=e23cde1bfd26cc0018d82f320d4e172a5d174ad5;p=live-boot-grml.git

diff --git a/hooks/live b/hooks/live
index 56425ad..190fac5 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
@@ -126,8 +126,15 @@ fi
 copy_exec /usr/bin/md5sum /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: wget
@@ -139,15 +146,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 +160,3 @@ if [ -x /usr/bin/curlftpfs ]
 then
 	copy_exec /usr/bin/curlftpfs /bin
 fi
-