Drop nameserver handling from ip= boot parameter.

[live-boot-grml.git] / components / 9990-cmdline-old

diff --git a/components/9990-cmdline-old b/components/9990-cmdline-old
index 2f566bb..521170f 100755 (executable)
--- 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
@@ -38,9 +51,8 @@ Cmdline_old ()
                                ;;
 
                        ethdevice=*)
-                               DEVICE="${_PARAMETER#ethdevice=}"
-                               ETHDEVICE="${DEVICE}"
-                               export DEVICE ETHDEVICE
+                               ETHDEVICE="${_PARAMETER#ethdevice=}"
+                               export ETHDEVICE
                                ;;
 
                        ethdevice-timeout=*)
@@ -97,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
                                ;;
 
@@ -258,6 +266,11 @@ Cmdline_old ()
                                UNIONTYPE="${_PARAMETER#union=}"
                                export UNIONTYPE
                                ;;
+
+                       vlan=*)
+                               VLANS="${VLANS} ${_PARAMETER#vlan=}"
+                               export VLANS
+                               ;;
                esac
        done