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

diff --git a/scripts/boot.sh b/scripts/boot.sh
index 90750b5..94f5e18 100755
--- a/scripts/boot.sh
+++ b/scripts/boot.sh
@@ -444,11 +444,16 @@ mountroot ()
 
 	. /live.vars
 
-	Arguments
+	_CMDLINE="$(cat /proc/cmdline)"
+	Cmdline
 
-	# make sure all harddisk devices are read-only
-	# this is important for forensic investigations
-	case "${READ_ONLY}" in
+	case "${LIVE_DEBUG}" in
+		true)
+			set -x
+			;;
+	esac
+
+	case "${LIVE_READ_ONLY}" in
 		true)
 			Read_only
 			;;
@@ -512,10 +517,11 @@ mountroot ()
 		panic "Unable to find a medium containing a live file system"
 	fi
 
-	if [ "${INTEGRITY_CHECK}" ]
-	then
-		integrity_check "${livefs_root}"
-	fi
+	case "${LIVE_VERIFY_CHECKSUMS}" in
+		true)
+			Verify_checksums "${livefs_root}"
+			;;
+	esac
 
 	if [ "${TORAM}" ]
 	then
@@ -624,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"