consolidate network related patches into 15_networking_grml.patch

[live-boot-grml.git] / debian / patches / 36_support_dhcp_bootoption.patch

diff --git a/debian/patches/36_support_dhcp_bootoption.patch b/debian/patches/36_support_dhcp_bootoption.patch
deleted file mode 100644 (file)
index ad416e3..0000000
--- a/debian/patches/36_support_dhcp_bootoption.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- a/components/9990-grml-networking.sh
-+++ b/components/9990-grml-networking.sh
-@@ -59,6 +59,14 @@
-         method="manual"
-     fi
- 
-+    # if boot option "nodhcp" is set but also boot option "dhcp" is
-+    # set, then dhcp should win over it as we default to dhcp and if
-+    # nodhcp is used as default boot option but "dhcp" is added then it
-+    # would be confusing to not get a working network setup
-+    if [ "$DHCP" = "true" ] ; then
-+        method="dhcp"
-+    fi
-+
-     cat >> $IFFILE << EOF
- allow-hotplug ${interface}
- iface ${interface} inet ${method}