X-Git-Url: http://git.grml.org/?a=blobdiff_plain;f=debian%2Fpatches%2F36_support_dhcp_bootoption.patch;h=9c81a2eb964c4210c6b54f83ec0abe8d469135b8;hb=1aa780ac2a7a1b66d33ac1e142d84ff149b5edf0;hp=fffd18f78a17a2a6d642ea9897d2668ef0830259;hpb=7f450c201f6aa9434f1dae176882a0ee226fa4cf;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..9c81a2e 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/scripts/boot/9990-grml-networking.sh
++++ b/scripts/boot/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
 +