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 03e8fc6..c896bbb 100755 (executable)
--- a/components/9990-cmdline-old
+++ b/components/9990-cmdline-old
@@ -23,6 +23,12 @@ Cmdline_old ()
                                export DNSSERVERS
                                unset DNS
                                ;;
+
+                       bootid=*)
+                               BOOTID="${_PARAMETER#bootid=}"
+                               export BOOTID
+                               ;;
+
                        dhcp)
                                # Force dhcp even while netbooting
                                # Use for debugging in case somebody works on fixing dhclient
@@ -33,14 +39,13 @@ Cmdline_old ()
                        nodhcp)
                                DHCP=""
                                export DHCP
-                               NODHCP="true"
+                               NODHCP="Yes"
                                export NODHCP
                                ;;
 
                        ethdevice=*)
-                               DEVICE="${_PARAMETER#ethdevice=}"
-                               ETHDEVICE="${DEVICE}"
-                               export DEVICE ETHDEVICE
+                               ETHDEVICE="${_PARAMETER#ethdevice=}"
+                               export ETHDEVICE
                                ;;
 
                        ethdevice-timeout=*)
@@ -86,19 +91,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
                                ;;
 
@@ -147,6 +153,11 @@ Cmdline_old ()
                                export NFS_COW
                                ;;
 
+                       nodhcphostname)
+                               NODHCPHOSTNAME="Yes"
+                               export NODHCPHOSTNAME
+                               ;;
+
                        nofstab)
                                NOFSTAB="true"
                                export NOFSTAB
@@ -253,6 +264,11 @@ Cmdline_old ()
                                UNIONTYPE="${_PARAMETER#union=}"
                                export UNIONTYPE
                                ;;
+
+                       vlan=*)
+                               VLANS="${VLANS} ${_PARAMETER#vlan=}"
+                               export VLANS
+                               ;;
                esac
        done