X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=hooks%2Flive;h=93a2831e70109e2127a2b131de3c3ad555cc3462;hb=274ce8e4e2b902e4e7b4871c284cee0285cf18a6;hp=e77c88b9b1ab25b14908061a8befeec2de295547;hpb=cc8e921a9aee8e61805f40ddbc77b349e750e553;p=live-boot-grml.git

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