Replacing previous imperfect changes for udevadm with check for udevadm and using...

[live-boot-grml.git] / hooks / live

diff --git a/hooks/live b/hooks/live
index 3552f3a..190fac5 100755 (executable)
--- a/hooks/live
+++ b/hooks/live
@@ -47,9 +47,12 @@ cp /usr/share/initramfs-tools/scripts/live-functions "${DESTDIR}"/scripts
 cp /usr/share/initramfs-tools/scripts/live-helpers "${DESTDIR}"/scripts
 
 # klibc dependencies
-for hidden_klibc_dep_library in libacl libblkid libuuid libdevmapper libattr
+for FILE in /lib/libacl* /lib/libblkid* /lib/libuuid* /lib/libdevmapper* /lib/libattr*
 do
-       cp -a /lib/${hidden_klibc_dep_library}.so.* "${DESTDIR}"/lib
+       if [ ! -e "${DESTDIR}"/"${FILE}" ]
+       then
+               cp -a "${FILE}" "${DESTDIR}"/"${FILE}"
+       fi
 done
 
 # Handling other stuff
@@ -90,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
@@ -123,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
@@ -132,3 +142,21 @@ if [ -x /usr/bin/wget ]
 then
        copy_exec /usr/bin/wget /bin
 fi
+
+# FUSE kernel module
+manual_add_modules fuse
+
+# FUSE filesystem: httpfs2
+if [ -x /usr/bin/httpfs2_ssl ]
+then
+       copy_exec /usr/bin/httpfs2_ssl /bin/httpfs
+elif [ -x /usr/bin/httpfs2 ]
+then
+       copy_exec /usr/bin/httpfs2 /bin/httpfs
+fi
+
+# FUSE filesystem: curlftpfs
+if [ -x /usr/bin/curlftpfs ]
+then
+       copy_exec /usr/bin/curlftpfs /bin
+fi