X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=components%2F9990-cmdline-old;h=d0659c8f40cc845dd68eb5245665c461cc7ad00f;hb=50fed6a7bf39de6018c361e5319b517977c2c50c;hp=8bb8254e13792a4e3998473d83c7e38dc0e6a330;hpb=983d4783b0efa954c2322b8c70a4908e4da6bf99;p=live-boot-grml.git

diff --git a/components/9990-cmdline-old b/components/9990-cmdline-old
index 8bb8254..d0659c8 100755
--- a/components/9990-cmdline-old
+++ b/components/9990-cmdline-old
@@ -18,6 +18,24 @@ Cmdline_old ()
 				BOOTIF="${_PARAMETER#BOOTIF=}"
 				;;
 
+			dns=*)
+			  	DNSSERVER="${_PARAMETER#*=}"
+				if echo "${DNSSERVER}" | grep -q , ; then
+					DNSSERVER1="${DNSSERVER%,*}"
+					DNSSERVER2="${DNSSERVER#*,}"
+					export DNSSERVER1 DNSSERVER2
+				else
+					DNSSERVER1="$DNSSERVER"
+					export DNSSERVER1
+				fi
+				unset DNSSERVER
+				;;
+
+			bootid=*)
+				BOOTID="${_PARAMETER#bootid=}"
+				export BOOTID
+				;;
+
 			dhcp)
 				# Force dhcp even while netbooting
 				# Use for debugging in case somebody works on fixing dhclient
@@ -28,12 +46,13 @@ Cmdline_old ()
 			nodhcp)
 				DHCP=""
 				export DHCP
+				NODHCP="Yes"
+				export NODHCP
 				;;
 
 			ethdevice=*)
-				DEVICE="${_PARAMETER#ethdevice=}"
-				ETHDEVICE="${DEVICE}"
-				export DEVICE ETHDEVICE
+				ETHDEVICE="${_PARAMETER#ethdevice=}"
+				export ETHDEVICE
 				;;
 
 			ethdevice-timeout=*)
@@ -79,19 +98,20 @@ Cmdline_old ()
 				export FROMISO
 				;;
 
+			ignore_bootid)
+				IGNORE_BOOTID="Yes"
+				export IGNORE_BOOTID
+				;;
+
 			ignore_uuid)
 				IGNORE_UUID="true"
 				export IGNORE_UUID
 				;;
 
 			ip=*)
-				STATICIP="${_PARAMETER#ip=}"
-
-				if [ -z "${STATICIP}" ]
-				then
-					STATICIP="frommedia"
-				fi
-
+				# copy complete ip=args into staticip, and
+				# keep multiple uses.
+				STATICIP="${STATICIP} ${_PARAMETER}"
 				export STATICIP
 				;;
 
@@ -140,6 +160,11 @@ Cmdline_old ()
 				export NFS_COW
 				;;
 
+			nodhcphostname)
+				NODHCPHOSTNAME="Yes"
+				export NODHCPHOSTNAME
+				;;
+
 			nofstab)
 				NOFSTAB="true"
 				export NOFSTAB
@@ -266,7 +291,7 @@ Cmdline_old ()
 
 	if [ -z "${UNIONTYPE}" ]
 	then
-		UNIONTYPE="aufs"
+		UNIONTYPE="overlay"
 		export UNIONTYPE
 	fi
 
@@ -285,7 +310,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