X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=scripts%2Fboot%2Fcmdline.sh;h=a3781da6d9d8fdf67453ada57d5b6ec78797610c;hb=b77506cb1f7c478c44886b3795e6bcc992566763;hp=296d1f7f39d962d29cc664dbcfb2f04f4eb8a983;hpb=6d096dc617bd53d2d29ed5871c09b7d08dd7fe0f;p=live-boot-grml.git

diff --git a/scripts/boot/cmdline.sh b/scripts/boot/cmdline.sh
index 296d1f7..a3781da 100755
--- a/scripts/boot/cmdline.sh
+++ b/scripts/boot/cmdline.sh
@@ -206,13 +206,10 @@ Cmdline ()
 				export PERSISTENCE_STORAGE
 				;;
 
-			persistence-subtext=*)
-				old_root_overlay_label="${old_root_overlay_label}-${_PARAMETER#persistence-subtext=}"
-				old_home_overlay_label="${old_home_overlay_label}-${_PARAMETER#persistence-subtext=}"
-				custom_overlay_label="${custom_overlay_label}-${_PARAMETER#persistence-subtext=}"
-				root_snapshot_label="${root_snapshot_label}-${_PARAMETER#persistence-subtext=}"
-				old_root_snapshot_label="${root_snapshot_label}-${_PARAMETER#persistence-subtext=}"
-				home_snapshot_label="${home_snapshot_label}-${_PARAMETER#persistence-subtext=}"
+			persistence-label=*)
+				old_root_overlay_label="${_PARAMETER#persistence-label=*}"
+				old_home_overlay_label="${_PARAMETER#persistence-label=*}"
+				custom_overlay_label="${_PARAMETER#persistence-label=*}"
 				;;
 
 			nopersistence)
@@ -220,16 +217,6 @@ Cmdline ()
 				export NOPERSISTENCE
 				;;
 
-			noprompt)
-				NOPROMPT="true"
-				export NOPROMPT
-				;;
-
-			noprompt=*)
-				NOPROMPT="${_PARAMETER#noprompt=}"
-				export NOPROMPT
-				;;
-
 			quickusbmodules)
 				QUICKUSBMODULES="true"
 				export QUICKUSBMODULES
@@ -240,11 +227,6 @@ Cmdline ()
 				export SHOWMOUNTS
 				;;
 
-			silent)
-				SILENT="true"
-				export SILENT
-				;;
-
 			todisk=*)
 				TODISK="${_PARAMETER#todisk=}"
 				export TODISK
@@ -337,7 +319,7 @@ Cmdline ()
 
 	if [ -z "${PERSISTENCE_METHOD}" ]
 	then
-		PERSISTENCE_METHOD="snapshot,overlay"
+		PERSISTENCE_METHOD="overlay"
 		export PERSISTENCE_METHOD
 	fi