Adding upstream version 4.0~a4.

[live-boot-grml.git] / backends / initramfs-tools / live.hook

diff --git a/backends/initramfs-tools/live.hook b/backends/initramfs-tools/live.hook
index 89420b6..d66c669 100755 (executable)
--- 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/* \
-            /live/image/live/boot.conf /live/image/live/boot/*
+            /lib/live/mount/media/live/boot.conf /lib/live/mount/media/live/boot/*
 do
        if [ -e "${_FILE}" ]
        then
@@ -84,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
 
@@ -139,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 ]
@@ -232,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 .