X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=components%2F9990-cmdline-old;h=975ade20c1918ef6e30041c28e90fdeb1f02a161;hb=9f0266a0a0e66de04153c4c9caa5e19c92b111c1;hp=91c1449d6da030bd0ee4a265f233054a20431bc4;hpb=1782f14f97bc63b0f0dde79e157e0806e0aaad44;p=live-boot-grml.git

diff --git a/components/9990-cmdline-old b/components/9990-cmdline-old
index 91c1449..975ade2 100755
--- a/components/9990-cmdline-old
+++ b/components/9990-cmdline-old
@@ -19,16 +19,10 @@ Cmdline_old ()
 				;;
 
 			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=*)
@@ -51,9 +45,8 @@ Cmdline_old ()
 				;;
 
 			ethdevice=*)
-				DEVICE="${_PARAMETER#ethdevice=}"
-				ETHDEVICE="${DEVICE}"
-				export DEVICE ETHDEVICE
+				ETHDEVICE="${_PARAMETER#ethdevice=}"
+				export ETHDEVICE
 				;;
 
 			ethdevice-timeout=*)
@@ -110,13 +103,9 @@ Cmdline_old ()
 				;;
 
 			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
 				;;
 
@@ -271,6 +260,11 @@ Cmdline_old ()
 				UNIONTYPE="${_PARAMETER#union=}"
 				export UNIONTYPE
 				;;
+
+			vlan=*)
+				VLANS="${VLANS} ${_PARAMETER#vlan=}"
+				export VLANS
+				;;
 		esac
 	done