Always move live filesystem mounts to /root within initramfs, regardless if mountpoin...

[live-boot-grml.git] / scripts / boot / 9990-main.sh

diff --git a/scripts/boot/9990-main.sh b/scripts/boot/9990-main.sh
index 8dcdfe6..ba77dd4 100755 (executable)
--- a/scripts/boot/9990-main.sh
+++ b/scripts/boot/9990-main.sh
@@ -19,19 +19,19 @@ Main ()
        . /live.vars
 
        _CMDLINE="$(cat /proc/cmdline)"
-       Cmdline
        Cmdline_old
 
-       case "${LIVE_DEBUG}" in
-               true)
-                       set -x
-                       ;;
-       esac
+       Debug
 
        Read_only
 
        Select_eth_device
 
+       if [ -e /conf/param.conf ]
+       then
+               . /conf/param.conf
+       fi
+
        # Needed here too because some things (*cough* udev *cough*)
        # changes the timeout
 
@@ -146,11 +146,8 @@ Main ()
        esac
 
        # Move to the new root filesystem so that programs there can get at it.
-       if [ ! -d /root/live/image ]
-       then
-               mkdir -p /root/live/image
-               mount --move /live/image /root/live/image
-       fi
+       mkdir -p /root/live/image
+       mount --move /live/image /root/live/image
 
        # aufs2 in kernel versions around 2.6.33 has a regression:
        # directories can't be accessed when read for the first the time,
@@ -159,7 +156,7 @@ Main ()
        ls /root/* >/dev/null 2>&1
 
        # Move findiso directory to the new root filesystem so that programs there can get at it.
-       if [ -d /live/findiso ] && [ ! -d /root/live/findiso ]
+       if [ -d /live/findiso ]
        then
                mkdir -p /root/live/findiso
                mount -n --move /live/findiso /root/live/findiso