X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Fboot%2F9990-main.sh;h=e67176ef44ab169c8f47ab5207c00bfa23148ef2;hb=f788126730ccd13eeef5a7a97796e001cfc6bb50;hp=fd10e5d43f7f7f9d6d109a987ffdcbc1d6ae5d51;hpb=d2b2a46118d331a5b3c0218c475da8e5aa831df8;p=live-boot-grml.git diff --git a/scripts/boot/9990-main.sh b/scripts/boot/9990-main.sh index fd10e5d..e67176e 100755 --- 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