Allowing to superseed live-boot cmdline through configuration files.

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

diff --git a/scripts/boot/9990-main.sh b/scripts/boot/9990-main.sh
index fd10e5d..e67176e 100755 (executable)
--- a/scripts/boot/9990-main.sh
+++ b/scripts/boot/9990-main.sh
@@ -2,7 +2,7 @@
 
 # set -e
 
-Main ()
+Live ()
 {
        if [ -x /scripts/local-top/cryptroot ]
        then
@@ -18,7 +18,7 @@ Main ()
 
        . /live.vars
 
-       _CMDLINE="$(cat /proc/cmdline)"
+       LIVE_BOOT_CMDLINE="${LIVE_BOOT_CMDLINE:-$(cat /proc/cmdline)}"
        Cmdline_old
 
        Debug
@@ -32,12 +32,6 @@ Main ()
                . /conf/param.conf
        fi
 
-       if [ -n "${FUSE_MOUNT}" ]
-       then
-               # fuse does not work with klibc mount
-               ln -f /bin/mount.util-linux /bin/mount
-       fi
-
        # Needed here too because some things (*cough* udev *cough*)
        # changes the timeout