X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=hooks%2Flive;h=19ff26a78a3bd2ee454a13db27c8d04de536ad66;hb=3e6ed90770401e583bfd7c6dfba5aab48caae56c;hp=cebe9c9d1665a82214c8b309c4fed35286b9bd15;hpb=0900b327b4389da17bd713319c443ce58a705bbe;p=live-boot-grml.git

diff --git a/hooks/live b/hooks/live
index cebe9c9..19ff26a 100755
--- a/hooks/live
+++ b/hooks/live
@@ -30,9 +30,9 @@ then
 	. /etc/live/boot.conf
 fi
 
-if ls /etc/live/boot.d/* > /dev/null 2>&1
+if ls /etc/live/boot.conf.d/* > /dev/null 2>&1
 then
-	for _FILE in /etc/live/boot.d/*
+	for _FILE in /etc/live/boot.conf.d/*
 	do
 		. ${_FILE}
 	done
@@ -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