X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Fboot.sh;h=94f5e1873c286198e094237ab4e5ed4815d355b7;hb=5097c70efc48e5039ddb4c46c0e359c0c389dba9;hp=d2a5c62a22b6c5e1fed8e11291bd2fd76fbd1ecd;hpb=bc9ae2d777db55ecb3697185da60ece205b1b90b;p=live-boot-grml.git

diff --git a/scripts/boot.sh b/scripts/boot.sh
index d2a5c62..94f5e18 100755
--- 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)
@@ -623,12 +630,23 @@ mountroot ()
 		log_end_msg
 	fi
 
+	if ! [ -d "/root/usr/share/live-boot" ]
+	then
+		panic "A wrong rootfs was mounted."
+	fi
+
 	maybe_break live-bottom
 	log_begin_msg "Running /scripts/live-bottom\n"
 
 	run_scripts /scripts/live-bottom
 	log_end_msg
 
+	case "${LIVE_SWAPON}" in
+		true)
+			Swapon
+			;;
+	esac
+
 	if [ "${UNIONFS}" = unionfs-fuse ]
 	then
 		umount "${rootmnt}/dev"