X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=hooks%2Flive;h=f68800dfe68f7350e71e8054d5224968b3c4bb89;hb=b72b24711cacdb0267c29816a0fd1b96a90836b0;hp=34d6eab7d317b83cdcfa2b8074d103c9842f4a7f;hpb=66d1235abf2dbc4062ed5bb7aef28d99a5a38eb2;p=live-boot-grml.git

diff --git a/hooks/live b/hooks/live
index 34d6eab..f68800d 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
@@ -61,7 +61,7 @@ cp /usr/share/initramfs-tools/scripts/live-helpers "${DESTDIR}"/scripts
 # klibc dependencies
 for FILE in /lib/libacl* /lib/libblkid* /lib/libuuid* /lib/libdevmapper* /lib/libattr*
 do
-	if [ ! -e "${DESTDIR}"/"${FILE}" ]
+	if [ ! -e "${DESTDIR}"/"${FILE}" ] && ls ${FILE} > /dev/null 2>&1
 	then
 		cp -a "${FILE}" "${DESTDIR}"/"${FILE}"
 	fi
@@ -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
@@ -190,12 +191,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 +247,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