VLAN support via boot option "vlan=<vid>:<phydevice>"

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

diff --git a/components/9990-cmdline-old b/components/9990-cmdline-old
index 8bb8254..521170f 100755 (executable)
--- a/components/9990-cmdline-old
+++ b/components/9990-cmdline-old
@@ -18,6 +18,24 @@ 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
+                               ;;
+
                        dhcp)
                                # Force dhcp even while netbooting
                                # Use for debugging in case somebody works on fixing dhclient
@@ -28,12 +46,13 @@ Cmdline_old ()
                        nodhcp)
                                DHCP=""
                                export DHCP
+                               NODHCP="Yes"
+                               export NODHCP
                                ;;
 
                        ethdevice=*)
-                               DEVICE="${_PARAMETER#ethdevice=}"
-                               ETHDEVICE="${DEVICE}"
-                               export DEVICE ETHDEVICE
+                               ETHDEVICE="${_PARAMETER#ethdevice=}"
+                               export ETHDEVICE
                                ;;
 
                        ethdevice-timeout=*)
@@ -79,19 +98,20 @@ Cmdline_old ()
                                export FROMISO
                                ;;
 
+                       ignore_bootid)
+                               IGNORE_BOOTID="Yes"
+                               export IGNORE_BOOTID
+                               ;;
+
                        ignore_uuid)
                                IGNORE_UUID="true"
                                export IGNORE_UUID
                                ;;
 
                        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
                                ;;
 
@@ -140,6 +160,11 @@ Cmdline_old ()
                                export NFS_COW
                                ;;
 
+                       nodhcphostname)
+                               NODHCPHOSTNAME="Yes"
+                               export NODHCPHOSTNAME
+                               ;;
+
                        nofstab)
                                NOFSTAB="true"
                                export NOFSTAB
@@ -241,6 +266,11 @@ Cmdline_old ()
                                UNIONTYPE="${_PARAMETER#union=}"
                                export UNIONTYPE
                                ;;
+
+                       vlan=*)
+                               VLANS="${VLANS} ${_PARAMETER#vlan=}"
+                               export VLANS
+                               ;;
                esac
        done
 
@@ -266,7 +296,7 @@ Cmdline_old ()
 
        if [ -z "${UNIONTYPE}" ]
        then
-               UNIONTYPE="aufs"
+               UNIONTYPE="overlay"
                export UNIONTYPE
        fi
 
@@ -285,7 +315,7 @@ Cmdline_old ()
 
                if [ ! -x /lib/cryptsetup/askpass ] || [ ! -x /sbin/cryptsetup ]
                then
-                       log_warning_msg "cryptsetup in unavailable"
+                       log_warning_msg "cryptsetup is unavailable"
                        PERSISTENCE_ENCRYPTION=$(echo ${PERSISTENCE_ENCRYPTION} | sed -e 's/\<luks,\|,\?luks$//g')
                        export PERSISTENCE_ENCRYPTION
                fi