Adding upstream version 3.0~a6.

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

diff --git a/hooks/live b/hooks/live
index cebe9c9..85a98a3 100755 (executable)
--- a/hooks/live
+++ b/hooks/live
@@ -175,8 +175,7 @@ copy_exec /usr/bin/md5sum /bin
 if [ -x /usr/bin/memdiskfind ]
 then
        copy_exec /usr/bin/memdiskfind
-       manual_add_modules phram
-       manual_add_modules mtdblock
+       manual_add_modules phram mtdblock
 fi
 
 # Program: cpio
@@ -191,12 +190,7 @@ copy_exec /bin/cpio /bin
 # Program: udev
 if [ -x /sbin/udevadm ]
 then
-       # lenny
        copy_exec /sbin/udevadm /sbin
-else
-       # etch
-       copy_exec /sbin/udevtrigger /sbin
-       copy_exec /sbin/udevsettle /sbin
 fi
 if [ -x /usr/bin/udevinfo ]
 then
@@ -252,10 +246,3 @@ then
        #mkdir -p $DESTDIR/etc
        #cp -p /etc/nsswitch.conf $DESTDIR/etc
 fi
-
-if [ "${LIVE_UNIONMOUNT}" = "true" ]
-then
-       # UnionMount
-       # only mount from patched util-linux can do this currently
-       copy_exec /bin/mount /bin/mount_full
-fi