Splitting out swap handling and rewriting to a live-boot subscript.

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

diff --git a/scripts/boot.sh b/scripts/boot.sh
index d2a5c62..02ac43a 100755 (executable)
--- a/scripts/boot.sh
+++ b/scripts/boot.sh
@@ -444,7 +444,14 @@ mountroot ()
 
        . /live.vars
 
-       Arguments
+       _CMDLINE="$(cat /proc/cmdline)"
+       Cmdline
+
+       case "${LIVE_DEBUG}" in
+               true)
+                       set -x
+                       ;;
+       esac
 
        case "${LIVE_READ_ONLY}" in
                true)
@@ -629,6 +636,12 @@ mountroot ()
        run_scripts /scripts/live-bottom
        log_end_msg
 
+       case "${LIVE_SWAPON}" in
+               true)
+                       Swapon
+                       ;;
+       esac
+
        if [ "${UNIONFS}" = unionfs-fuse ]
        then
                umount "${rootmnt}/dev"