X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=backends%2Finitramfs-tools%2Flive.hook;h=d66c6694d5c6465ea74131d16a751f9dd9d07311;hb=4a5a84171f9e5f3f7ff20e9c1d855787e270cd0c;hp=738257b7e36c8bfa23b9b34d7e9241874203b017;hpb=b240d98d789fdce75a85a63dcbc0a5008b003d04;p=live-boot-grml.git

diff --git a/backends/initramfs-tools/live.hook b/backends/initramfs-tools/live.hook
index 738257b..d66c669 100755
--- a/backends/initramfs-tools/live.hook
+++ b/backends/initramfs-tools/live.hook
@@ -8,7 +8,7 @@ set -e
 
 # Reading configuration file from filesystem and live-media
 for _FILE in /etc/live/boot.conf /etc/live/boot/* \
-	     /lib/live/image/live/boot.conf /lib/live/image/live/boot/*
+	     /lib/live/mount/media/live/boot.conf /lib/live/mount/media/live/boot/*
 do
 	if [ -e "${_FILE}" ]
 	then
@@ -143,11 +143,19 @@ then
 	copy_exec /usr/bin/eject /bin
 fi
 
+# Program: mount
+# fuse does not work with klibc mount
+copy_exec /bin/mount /bin/mount.util-linux
+
 [ "${QUIET}" ] || echo -n " utils"
 
 # Feature: Verify Checksums
-copy_exec /usr/bin/sha256sum /bin
-copy_exec /usr/bin/md5sum /bin
+if [ -e /etc/progress-linux_version ]
+then
+	copy_exec /usr/bin/sha256sum /bin
+else
+	copy_exec /usr/bin/md5sum /bin
+fi
 
 # Program: memdisk
 if [ -x /usr/bin/memdiskfind ]
@@ -236,14 +244,4 @@ case "${LIVE_DNS}" in
 		;;
 esac
 
-case "${LIVE_UNIONMOUNT}" in
-	true)
-		[ "${QUIET}" ] || echo -n " unionmount"
-
-		# UnionMount
-		# only mount from patched util-linux can do this currently
-		copy_exec /bin/mount /bin/mount_full
-		;;
-esac
-
 [ "${QUIET}" ] || echo .