X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=backends%2Finitramfs-tools%2Flive.hook;h=d66c6694d5c6465ea74131d16a751f9dd9d07311;hb=d9586141f1bf766d5cfd77346bc48e6885d5762f;hp=86ef1179005f605d30882e1479e75e36fefc4fb0;hpb=eb77833cf3f40583fe02dad42b667cc6b091f2c3;p=live-boot-grml.git

diff --git a/backends/initramfs-tools/live.hook b/backends/initramfs-tools/live.hook
index 86ef117..d66c669 100755
--- a/backends/initramfs-tools/live.hook
+++ b/backends/initramfs-tools/live.hook
@@ -6,19 +6,15 @@ set -e
 
 [ "${QUIET}" ] || echo -n "live-boot:"
 
-# Reading configuration files
-if [ -e /etc/live/boot.conf ]
-then
-	. /etc/live/boot.conf
-fi
-
-if ls /etc/live/boot.d/*.conf > /dev/null 2>&1
-then
-	for _FILE in /etc/live/boot.d/*.conf
-	do
-		. ${_FILE}
-	done
-fi
+# Reading configuration file from filesystem and live-media
+for _FILE in /etc/live/boot.conf /etc/live/boot/* \
+	     /lib/live/mount/media/live/boot.conf /lib/live/mount/media/live/boot/*
+do
+	if [ -e "${_FILE}" ]
+	then
+		. "${_FILE}"
+	fi
+done
 
 # Checking live-boot
 if [ ! -e /lib/live/boot ]
@@ -88,6 +84,10 @@ fi
 manual_add_modules ext3
 manual_add_modules ext4
 
+# Filesystem: hfs/hfsplus
+manual_add_modules hfs
+manual_add_modules hfsplus
+
 # Filesystem: jffs2
 manual_add_modules jffs2
 
@@ -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 .