Adding upstream version 3.0~b1.

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

diff --git a/scripts/boot/9990-main.sh b/scripts/boot/9990-main.sh
index 3ad6a72..5732b2a 100755 (executable)
--- a/scripts/boot/9990-main.sh
+++ b/scripts/boot/9990-main.sh
@@ -19,23 +19,19 @@ Main ()
        . /live.vars
 
        _CMDLINE="$(cat /proc/cmdline)"
-       Cmdline
        Cmdline_old
 
-       case "${LIVE_DEBUG}" in
-               true)
-                       set -x
-                       ;;
-       esac
+       Debug
 
-       case "${LIVE_READ_ONLY}" in
-               true)
-                       Read_only
-                       ;;
-       esac
+       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
 
@@ -92,11 +88,7 @@ Main ()
                panic "Unable to find a medium containing a live file system"
        fi
 
-       case "${LIVE_VERIFY_CHECKSUMS}" in
-               true)
-                       Verify_checksums "${livefs_root}"
-                       ;;
-       esac
+       Verify_checksums "${livefs_root}"
 
        if [ "${TORAM}" ]
        then
@@ -203,11 +195,7 @@ Main ()
        Fstab
        Netbase
 
-       case "${LIVE_SWAPON}" in
-               true)
-                       Swapon
-                       ;;
-       esac
+       Swap
 
        case "${UNIONFS}" in
                unionfs-fuse)