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

diff --git a/backends/initramfs-tools/live.hook b/backends/initramfs-tools/live.hook
index 738257b..1814211 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
@@ -45,7 +45,6 @@ do
 	copy_exec "${FILE}"
 done
 
-# wheezy/sid
 if [ -e /lib/udev/rules.d/60-cdrom_id.rules ]
 then
 	mkdir -p ${DESTDIR}/lib/udev/rules.d
@@ -143,11 +142,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 ]
@@ -164,11 +171,6 @@ then
 	[ "${QUIET}" ] || echo -n " udev"
 	copy_exec /sbin/udevadm
 fi
-if [ -x /usr/bin/udevinfo ]
-then
-	[ "${QUIET}" ] || echo -n " udev"
-	copy_exec /usr/bin/udevinfo /bin
-fi
 
 # Program: wget
 if [ -x /usr/bin/wget ]
@@ -236,14 +238,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 .