X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=debian%2Fpatches%2F36_support_dhcp_bootoption.patch;h=ad416e3227c586c177c8fb96e2b67d4e2771c04c;hb=3b3ac7b387df59cc871f6572344f249a203b371c;hp=fffd18f78a17a2a6d642ea9897d2668ef0830259;hpb=76af4813596007fc5e4db649f9dd9b498058e2e2;p=live-boot-grml.git

diff --git a/debian/patches/36_support_dhcp_bootoption.patch b/debian/patches/36_support_dhcp_bootoption.patch
index fffd18f..ad416e3 100644
--- a/debian/patches/36_support_dhcp_bootoption.patch
+++ b/debian/patches/36_support_dhcp_bootoption.patch
@@ -1,17 +1,6 @@
---- a/scripts/live
-+++ b/scripts/live
-@@ -399,7 +399,7 @@
- 
- 	for dev in $devlist ; do
- 		param="$(get_ipconfig_para $dev)"
--		if [ -n "$NODHCP" ] && [ "$param" = "$dev" ] ; then
-+		if [ -n "$NODHCP" ] && [ "$param" = "$dev" ] && [ "$DHCP" != "Force" ] ; then
- 			echo "Ignoring network device $dev due to nodhcp." | tee -a /live-boot.log
- 			continue
- 		fi
---- a/scripts/live-bottom/23networking_grml
-+++ b/scripts/live-bottom/23networking_grml
-@@ -75,6 +75,14 @@
+--- a/components/9990-grml-networking.sh
++++ b/components/9990-grml-networking.sh
+@@ -59,6 +59,14 @@
          method="manual"
      fi
  
@@ -19,7 +8,7 @@
 +    # 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" = "Force" ] ; then
++    if [ "$DHCP" = "true" ] ; then
 +        method="dhcp"
 +    fi
 +