X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Fboot%2Farguments.sh;h=5f345122b3d703b7678704927d68790ba0c2fa82;hb=bc9ae2d777db55ecb3697185da60ece205b1b90b;hp=c526b9a13ac2623184a8293753176250816abc53;hpb=5d6acf56af17449a32a17194059d0ad437c5f988;p=live-boot-grml.git

diff --git a/scripts/boot/arguments.sh b/scripts/boot/arguments.sh
index c526b9a..5f34512 100755
--- a/scripts/boot/arguments.sh
+++ b/scripts/boot/arguments.sh
@@ -4,33 +4,26 @@
 
 Arguments ()
 {
-	PRESEEDS=""
-	LOCATIONS=""
-
 	for ARGUMENT in $(cat /proc/cmdline)
 	do
 		case "${ARGUMENT}" in
-			read-only)
-				READ_ONLY="true"
+			live-boot.read-only|read-only)
+				LIVE_READ_ONLY="true"
+				export LIVE_READ_ONLY
 				;;
 
-			skipconfig)
-				NOACCESSIBILITY="Yes"
-				NOFASTBOOT="Yes"
-				NOFSTAB="Yes"
-				NONETWORKING="Yes"
-
-				export NOACCESSIBILITY NOFASTBOOT NOFSTAB NONETWORKING
+			live-boot.verify-checksums|verify-checksums)
+				LIVE_VERIFY_CHECKSUMS="true"
+				export LIVE_VERIFY_CHECKSUMS
 				;;
 
-			access=*)
-				ACCESS="${ARGUMENT#access=}"
-				export ACCESS
-				;;
+			# parameters below need review
+			skipconfig)
+				NOFASTBOOT="true"
+				NOFSTAB="true"
+				NONETWORKING="true"
 
-			console=*)
-				DEFCONSOLE="${ARGUMENT#*=}"
-				export DEFCONSOLE
+				export NOFASTBOOT NOFSTAB NONETWORKING
 				;;
 
 			BOOTIF=*)
@@ -38,7 +31,7 @@ Arguments ()
 				;;
 
 			debug)
-				DEBUG="Yes"
+				DEBUG="true"
 				export DEBUG
 
 				set -x
@@ -47,12 +40,13 @@ Arguments ()
 			dhcp)
 				# Force dhcp even while netbooting
 				# Use for debugging in case somebody works on fixing dhclient
-				DHCP="Force";
+				DHCP="true";
 				export DHCP
 				;;
 
 			nodhcp)
-				unset DHCP
+				DHCP=""
+				export DHCP
 				;;
 
 			ethdevice=*)
@@ -76,11 +70,6 @@ Arguments ()
 				export FINDISO
 				;;
 
-			forcepersistencefsck)
-				FORCEPERSISTENCEFSCK="Yes"
-				export FORCEPERSISTENCEFSCK
-				;;
-
 			ftpfs=*)
 				FTPFS="${ARGUMENT#ftpfs=}"
 				export FTPFS
@@ -110,15 +99,10 @@ Arguments ()
 				;;
 
 			ignore_uuid)
-				IGNORE_UUID="Yes"
+				IGNORE_UUID="true"
 				export IGNORE_UUID
 				;;
 
-			integrity-check)
-				INTEGRITY_CHECK="Yes"
-				export INTEGRITY_CHECK
-				;;
-
 			ip=*)
 				STATICIP="${ARGUMENT#ip=}"
 
@@ -130,11 +114,6 @@ Arguments ()
 				export STATICIP
 				;;
 
-			live-getty)
-				LIVE_GETTY="1"
-				export LIVE_GETTY
-				;;
-
 			live-media=*|bootfrom=*)
 				LIVE_MEDIA="${ARGUMENT#*=}"
 				export LIVE_MEDIA
@@ -180,23 +159,18 @@ Arguments ()
 				export NFS_COW
 				;;
 
-			noaccessibility)
-				NOACCESSIBILITY="Yes"
-				export NOACCESSIBILITY
-				;;
-
 			nofastboot)
-				NOFASTBOOT="Yes"
+				NOFASTBOOT="true"
 				export NOFASTBOOT
 				;;
 
 			nofstab)
-				NOFSTAB="Yes"
+				NOFSTAB="true"
 				export NOFSTAB
 				;;
 
 			nonetworking)
-				NONETWORKING="Yes"
+				NONETWORKING="true"
 				export NONETWORKING
 				;;
 
@@ -205,12 +179,12 @@ Arguments ()
 				;;
 
 			swapon)
-				SWAPON="Yes"
+				SWAPON="true"
 				export SWAPON
 				;;
 
 			persistence)
-				PERSISTENCE="Yes"
+				PERSISTENCE="true"
 				export PERSISTENCE
 				;;
 
@@ -233,7 +207,7 @@ Arguments ()
 				export PERSISTENCE_PATH
 				;;
 			persistence-read-only)
-				PERSISTENCE_READONLY="Yes"
+				PERSISTENCE_READONLY="true"
 				export PERSISTENCE_READONLY
 				;;
 
@@ -252,12 +226,12 @@ Arguments ()
 				;;
 
 			nopersistence)
-				NOPERSISTENCE="Yes"
+				NOPERSISTENCE="true"
 				export NOPERSISTENCE
 				;;
 
 			noprompt)
-				NOPROMPT="Yes"
+				NOPROMPT="true"
 				export NOPROMPT
 				;;
 
@@ -267,34 +241,17 @@ Arguments ()
 				;;
 
 			quickusbmodules)
-				QUICKUSBMODULES="Yes"
+				QUICKUSBMODULES="true"
 				export QUICKUSBMODULES
 				;;
 
-			preseed/file=*|file=*)
-				LOCATIONS="${ARGUMENT#*=} ${LOCATIONS}"
-				export LOCATIONS
-				;;
-
-			nopreseed)
-				NOPRESEED="Yes"
-				export NOPRESEED
-				;;
-
-			*/*=*)
-				question="${ARGUMENT%%=*}"
-				value="${ARGUMENT#*=}"
-				PRESEEDS="${PRESEEDS}\"${question}=${value}\" "
-				export PRESEEDS
-				;;
-
 			showmounts)
-				SHOWMOUNTS="Yes"
+				SHOWMOUNTS="true"
 				export SHOWMOUNTS
 				;;
 
 			silent)
-				SILENT="Yes"
+				SILENT="true"
 				export SILENT
 				;;
 
@@ -304,28 +261,28 @@ Arguments ()
 				;;
 
 			toram)
-				TORAM="Yes"
+				TORAM="true"
 				export TORAM
 				;;
 
 			toram=*)
-				TORAM="Yes"
+				TORAM="true"
 				MODULETORAM="${ARGUMENT#toram=}"
 				export TORAM MODULETORAM
 				;;
 
 			exposedroot)
-				EXPOSED_ROOT="Yes"
+				EXPOSED_ROOT="true"
 				export EXPOSED_ROOT
 				;;
 
 			plainroot)
-				PLAIN_ROOT="Yes"
+				PLAIN_ROOT="true"
 				export PLAIN_ROOT
 				;;
 
 			skipunion)
-				SKIP_UNION_MOUNTS="Yes"
+				SKIP_UNION_MOUNTS="true"
 				export SKIP_UNION_MOUNTS
 				;;