projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Minimize delta to Debian's upstream/master
[live-boot-grml.git]
/
components
/
9990-cmdline-old
diff --git
a/components/9990-cmdline-old
b/components/9990-cmdline-old
index
c896bbb
..
6ac6eb5
100755
(executable)
--- a/
components/9990-cmdline-old
+++ b/
components/9990-cmdline-old
@@
-39,13
+39,14
@@
Cmdline_old ()
nodhcp)
DHCP=""
export DHCP
nodhcp)
DHCP=""
export DHCP
- NODHCP="
Yes
"
+ NODHCP="
true
"
export NODHCP
;;
ethdevice=*)
export NODHCP
;;
ethdevice=*)
- ETHDEVICE="${_PARAMETER#ethdevice=}"
- export ETHDEVICE
+ DEVICE="${_PARAMETER#ethdevice=}"
+ ETHDEVICE="${DEVICE}"
+ export DEVICE ETHDEVICE
;;
ethdevice-timeout=*)
;;
ethdevice-timeout=*)
@@
-102,9
+103,13
@@
Cmdline_old ()
;;
ip=*)
;;
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
;;
export STATICIP
;;