X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Fboot%2F9990-main.sh;h=ba77dd4f8f7d8dffb12296fb505071bad42b3ad2;hb=b7f0254874e284b1370f00056a72541fccccd07e;hp=3ad6a7260e5396167efa03769fc7f01e44b44587;hpb=20830fef5068d1afb31b1d26573eca2e04ded30e;p=live-boot-grml.git

diff --git a/scripts/boot/9990-main.sh b/scripts/boot/9990-main.sh
index 3ad6a72..ba77dd4 100755
--- 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
@@ -154,11 +146,8 @@ Main ()
 	esac
 
 	# Move to the new root filesystem so that programs there can get at it.
-	if [ ! -d /root/live/image ]
-	then
-		mkdir -p /root/live/image
-		mount --move /live/image /root/live/image
-	fi
+	mkdir -p /root/live/image
+	mount --move /live/image /root/live/image
 
 	# aufs2 in kernel versions around 2.6.33 has a regression:
 	# directories can't be accessed when read for the first the time,
@@ -167,7 +156,7 @@ Main ()
 	ls /root/* >/dev/null 2>&1
 
 	# Move findiso directory to the new root filesystem so that programs there can get at it.
-	if [ -d /live/findiso ] && [ ! -d /root/live/findiso ]
+	if [ -d /live/findiso ]
 	then
 		mkdir -p /root/live/findiso
 		mount -n --move /live/findiso /root/live/findiso
@@ -203,11 +192,7 @@ Main ()
 	Fstab
 	Netbase
 
-	case "${LIVE_SWAPON}" in
-		true)
-			Swapon
-			;;
-	esac
+	Swap
 
 	case "${UNIONFS}" in
 		unionfs-fuse)