From: Michael Prokop <mika@grml.org>
Date: Tue, 28 Jun 2016 07:36:54 +0000 (+0200)
Subject: components/9990-cmdline-old: sync with Debian
X-Git-Url: http://git.grml.org/?a=commitdiff_plain;h=26d4935079f55456b0212c4e1bec6438bed58c6c;hp=71a95e125af2bd8b3494cbbe26a4856a1fa37e61;p=live-boot-grml.git

components/9990-cmdline-old: sync with Debian

* no longer export NODHCP (seems to be unused)
* ethdevice boot option: also export DEVICE variable
* if STATICIP is unset then default to STATICIP="frommedia"
---

diff --git a/components/9990-cmdline-old b/components/9990-cmdline-old
index a195e3e..068eea5 100755
--- a/components/9990-cmdline-old
+++ b/components/9990-cmdline-old
@@ -33,13 +33,12 @@ Cmdline_old ()
 			nodhcp)
 				DHCP=""
 				export DHCP
-				NODHCP="Yes"
-				export NODHCP
 				;;
 
 			ethdevice=*)
-				ETHDEVICE="${_PARAMETER#ethdevice=}"
-				export ETHDEVICE
+				DEVICE="${_PARAMETER#ethdevice=}"
+				ETHDEVICE="${DEVICE}"
+				export DEVICE ETHDEVICE
 				;;
 
 			ethdevice-timeout=*)
@@ -99,6 +98,12 @@ Cmdline_old ()
 				# copy complete ip=args into staticip, and
 				# keep multiple uses.
 				STATICIP="${STATICIP} ${_PARAMETER}"
+
+				if [ -z "${STATICIP}" ]
+				then
+					STATICIP="frommedia"
+				fi
+
 				export STATICIP
 				;;