X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=components%2F9990-cmdline-old;h=d0659c8f40cc845dd68eb5245665c461cc7ad00f;hb=7200e4a927e3c8ff6b25b0a8b6860a36827b653a;hp=cccd8f20afbd90063c7115286d705a2acc1b038d;hpb=773bef668749c32f1b01d6fa3e61a251602016f5;p=live-boot-grml.git

diff --git a/components/9990-cmdline-old b/components/9990-cmdline-old
index cccd8f2..d0659c8 100755
--- a/components/9990-cmdline-old
+++ b/components/9990-cmdline-old
@@ -18,6 +18,19 @@ 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
@@ -33,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=*)
@@ -95,13 +109,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
 				;;
 
@@ -150,6 +160,11 @@ Cmdline_old ()
 				export NFS_COW
 				;;
 
+			nodhcphostname)
+				NODHCPHOSTNAME="Yes"
+				export NODHCPHOSTNAME
+				;;
+
 			nofstab)
 				NOFSTAB="true"
 				export NOFSTAB