Merge remote-tracking branch 'upstream/master'

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

diff --git a/components/9990-cmdline-old b/components/9990-cmdline-old
index d0659c8..f04c0ff 100755 (executable)
--- a/components/9990-cmdline-old
+++ b/components/9990-cmdline-old
@@ -17,18 +17,11 @@ Cmdline_old ()
                        BOOTIF=*)
                                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
+                               DNS=${_PARAMETER#dns=}
+                               DNSSERVERS=$(echo ${DNS} | sed 's/,/ /g')
+                               export DNSSERVERS
+                               unset DNS
                                ;;
 
                        bootid=*)
@@ -266,6 +259,11 @@ Cmdline_old ()
                                UNIONTYPE="${_PARAMETER#union=}"
                                export UNIONTYPE
                                ;;
+
+                       vlan=*)
+                               VLANS="${VLANS} ${_PARAMETER#vlan=}"
+                               export VLANS
+                               ;;
                esac
        done