X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=components%2F9990-cmdline-old;h=1504e1e356763f8c16564eb73663496569a9d9bc;hb=322e57a4a7c972702e93038df009c045286bffbd;hp=8bb8254e13792a4e3998473d83c7e38dc0e6a330;hpb=a6e250845a22f7b54e2936a64e98430ed3c79194;p=live-boot-grml.git

diff --git a/components/9990-cmdline-old b/components/9990-cmdline-old
index 8bb8254..1504e1e 100755
--- a/components/9990-cmdline-old
+++ b/components/9990-cmdline-old
@@ -17,6 +17,17 @@ Cmdline_old ()
 			BOOTIF=*)
 				BOOTIF="${_PARAMETER#BOOTIF=}"
 				;;
+			dns=*)
+				DNS=${_PARAMETER#dns=}
+				DNSSERVERS=$(echo ${DNS} | sed 's/,/ /g')
+				export DNSSERVERS
+				unset DNS
+				;;
+
+			bootid=*)
+				BOOTID="${_PARAMETER#bootid=}"
+				export BOOTID
+				;;
 
 			dhcp)
 				# Force dhcp even while netbooting
@@ -28,6 +39,8 @@ Cmdline_old ()
 			nodhcp)
 				DHCP=""
 				export DHCP
+				NODHCP="true"
+				export NODHCP
 				;;
 
 			ethdevice=*)
@@ -79,6 +92,11 @@ Cmdline_old ()
 				export FROMISO
 				;;
 
+			ignore_bootid)
+				IGNORE_BOOTID="Yes"
+				export IGNORE_BOOTID
+				;;
+
 			ignore_uuid)
 				IGNORE_UUID="true"
 				export IGNORE_UUID
@@ -140,6 +158,11 @@ Cmdline_old ()
 				export NFS_COW
 				;;
 
+			nodhcphostname)
+				NODHCPHOSTNAME="Yes"
+				export NODHCPHOSTNAME
+				;;
+
 			nofstab)
 				NOFSTAB="true"
 				export NOFSTAB
@@ -154,6 +177,11 @@ Cmdline_old ()
 				ramdisk_size="${_PARAMETER#ramdisk-size=}"
 				;;
 
+			overlay-size=*)
+				OVERLAY_SIZE="${_PARAMETER#overlay-size=}"
+				export OVERLAY_SIZE
+				;;
+
 			persistence)
 				PERSISTENCE="true"
 				export PERSISTENCE
@@ -188,7 +216,7 @@ Cmdline_old ()
 				;;
 
 			persistence-label=*)
-				custom_overlay_label="${_PARAMETER#persistence-label=*}"
+				custom_overlay_label=$(echo ${_PARAMETER#persistence-label=*} | sed -e 's/,/ /g')
 				;;
 
 			nopersistence)
@@ -241,6 +269,11 @@ Cmdline_old ()
 				UNIONTYPE="${_PARAMETER#union=}"
 				export UNIONTYPE
 				;;
+
+			vlan=*)
+				VLANS="${VLANS} ${_PARAMETER#vlan=}"
+				export VLANS
+				;;
 		esac
 	done
 
@@ -266,7 +299,7 @@ Cmdline_old ()
 
 	if [ -z "${UNIONTYPE}" ]
 	then
-		UNIONTYPE="aufs"
+		UNIONTYPE="overlay"
 		export UNIONTYPE
 	fi
 
@@ -285,7 +318,7 @@ Cmdline_old ()
 
 		if [ ! -x /lib/cryptsetup/askpass ] || [ ! -x /sbin/cryptsetup ]
 		then
-			log_warning_msg "cryptsetup in unavailable"
+			log_warning_msg "cryptsetup is unavailable"
 			PERSISTENCE_ENCRYPTION=$(echo ${PERSISTENCE_ENCRYPTION} | sed -e 's/\<luks,\|,\?luks$//g')
 			export PERSISTENCE_ENCRYPTION
 		fi