projects
/
live-boot-grml.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Allow +2 nameserver entries for dns= boot option
[live-boot-grml.git]
/
components
/
9990-cmdline-old
diff --git
a/components/9990-cmdline-old
b/components/9990-cmdline-old
index
2f566bb
..
975ade2
100755
(executable)
--- a/
components/9990-cmdline-old
+++ b/
components/9990-cmdline-old
@@
-18,6
+18,13
@@
Cmdline_old ()
BOOTIF="${_PARAMETER#BOOTIF=}"
;;
BOOTIF="${_PARAMETER#BOOTIF=}"
;;
+ dns=*)
+ DNS=${_PARAMETER#dns=}
+ DNSSERVERS=$(echo ${DNS} | sed 's/,/ /g')
+ export DNSSERVERS
+ unset DNS
+ ;;
+
bootid=*)
BOOTID="${_PARAMETER#bootid=}"
export BOOTID
bootid=*)
BOOTID="${_PARAMETER#bootid=}"
export BOOTID
@@
-38,9
+45,8
@@
Cmdline_old ()
;;
ethdevice=*)
;;
ethdevice=*)
- DEVICE="${_PARAMETER#ethdevice=}"
- ETHDEVICE="${DEVICE}"
- export DEVICE ETHDEVICE
+ ETHDEVICE="${_PARAMETER#ethdevice=}"
+ export ETHDEVICE
;;
ethdevice-timeout=*)
;;
ethdevice-timeout=*)
@@
-97,13
+103,9
@@
Cmdline_old ()
;;
ip=*)
;;
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
;;
export STATICIP
;;
@@
-258,6
+260,11
@@
Cmdline_old ()
UNIONTYPE="${_PARAMETER#union=}"
export UNIONTYPE
;;
UNIONTYPE="${_PARAMETER#union=}"
export UNIONTYPE
;;
+
+ vlan=*)
+ VLANS="${VLANS} ${_PARAMETER#vlan=}"
+ export VLANS
+ ;;
esac
done
esac
done