X-Git-Url: http://git.grml.org/?p=live-boot-grml.git;a=blobdiff_plain;f=components%2F9990-cmdline-old;h=6ac6eb558cf3045a2d38885039560b14a654c1b0;hp=d0659c8f40cc845dd68eb5245665c461cc7ad00f;hb=HEAD;hpb=2f9a2eee7ea6f622b7c525d5ae88564a0010d169

diff --git a/components/9990-cmdline-old b/components/9990-cmdline-old
index d0659c8..1504e1e 100755
--- a/components/9990-cmdline-old
+++ b/components/9990-cmdline-old
@@ -17,18 +17,11 @@ Cmdline_old ()
 			BOOTIF=*)
 				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
+				DNS=${_PARAMETER#dns=}
+				DNSSERVERS=$(echo ${DNS} | sed 's/,/ /g')
+				export DNSSERVERS
+				unset DNS
 				;;
 
 			bootid=*)
@@ -46,13 +39,14 @@ Cmdline_old ()
 			nodhcp)
 				DHCP=""
 				export DHCP
-				NODHCP="Yes"
+				NODHCP="true"
 				export NODHCP
 				;;
 
 			ethdevice=*)
-				ETHDEVICE="${_PARAMETER#ethdevice=}"
-				export ETHDEVICE
+				DEVICE="${_PARAMETER#ethdevice=}"
+				ETHDEVICE="${DEVICE}"
+				export DEVICE ETHDEVICE
 				;;
 
 			ethdevice-timeout=*)
@@ -109,9 +103,13 @@ Cmdline_old ()
 				;;
 
 			ip=*)
-				# copy complete ip=args into staticip, and
-				# keep multiple uses.
-				STATICIP="${STATICIP} ${_PARAMETER}"
+				STATICIP="${_PARAMETER#ip=}"
+
+				if [ -z "${STATICIP}" ]
+				then
+					STATICIP="frommedia"
+				fi
+
 				export STATICIP
 				;;
 
@@ -179,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
@@ -213,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)
@@ -266,6 +269,11 @@ Cmdline_old ()
 				UNIONTYPE="${_PARAMETER#union=}"
 				export UNIONTYPE
 				;;
+
+			vlan=*)
+				VLANS="${VLANS} ${_PARAMETER#vlan=}"
+				export VLANS
+				;;
 		esac
 	done