X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Fboot.sh;h=736e5879e1f29e121bdfcadcbf01ef31101b9716;hb=refs%2Ftags%2Fdebian%2F3.0_a30-1;hp=2fe563ea5785b851efa3927ffda2c78c4a3f074c;hpb=be6b2f51059e0604bd3728e6cd603972df8cf619;p=live-boot-grml.git

diff --git a/scripts/boot.sh b/scripts/boot.sh
index 2fe563e..736e587 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
 			;;
@@ -625,11 +630,20 @@ mountroot ()
 		log_end_msg
 	fi
 
-	maybe_break live-bottom
-	log_begin_msg "Running /scripts/live-bottom\n"
+	if ! [ -d "/root/usr/share/live-boot" ]
+	then
+		panic "A wrong rootfs was mounted."
+	fi
 
-	run_scripts /scripts/live-bottom
-	log_end_msg
+	persistence_exclude
+	fstab
+	Netbase
+
+	case "${LIVE_SWAPON}" in
+		true)
+			Swapon
+			;;
+	esac
 
 	if [ "${UNIONFS}" = unionfs-fuse ]
 	then