X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=backends%2Finitramfs-tools%2Flive.hook;h=c5b81b06548e7e9cfe17ea25fcd2c7b31dd2473b;hb=c9d72b99501c159a9aebf8f6f3469ca972ea9613;hp=00da049cd309477a5e2b59d9bf8a4fa0aefbf51b;hpb=cdece4c8e50051e790d657b1ff9f090ed4737907;p=live-boot-grml.git diff --git a/backends/initramfs-tools/live.hook b/backends/initramfs-tools/live.hook index 00da049..c5b81b0 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/* > /dev/null 2>&1 -then - for _FILE in /etc/live/boot/* - 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,6 +143,10 @@ 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 @@ -236,14 +240,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 .