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

diff --git a/hooks/live b/hooks/live
index e77c88b..cebe9c9 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
@@ -175,7 +175,8 @@ copy_exec /usr/bin/md5sum /bin
 if [ -x /usr/bin/memdiskfind ]
 then
 	copy_exec /usr/bin/memdiskfind
-	manual_add_modules phram mtdblock
+	manual_add_modules phram
+	manual_add_modules mtdblock
 fi
 
 # Program: cpio
@@ -251,3 +252,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