Always honor the "nodhcp" boot option

Thanks to Ulrich Dangel for the patch.

diff --git a/debian/patches/00list b/debian/patches/00list
index 8115311..7cb969e 100644 (file)
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -9,3 +9,4 @@
 13_always_display_warnings_and_failures.dpatch
 14_no_blkid_on_lenny.dpatch
 15_remove_resolv_conf_symlink.dpatch
+16_always_honor_nodhcp.dpatch

diff --git a/debian/patches/16_always_honor_nodhcp.dpatch b/debian/patches/16_always_honor_nodhcp.dpatch
new file mode 100755 (executable)
index 0000000..80a2522
--- /dev/null
+++ b/debian/patches/16_always_honor_nodhcp.dpatch
@@ -0,0 +1,35 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 16_always_honor_nodhcp.dpatch by Ulrich Dangel<mru@grml.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Always honor the nodhcp boot option
+
+@DPATCH@
+
+diff --git a/scripts/live b/scripts/live
+index d79beed..0b698de 100755
+--- a/scripts/live
++++ b/scripts/live
+@@ -83,7 +83,8 @@ Arguments ()
+                               ;;
+ 
+                       nodhcp)
+-                              unset DHCP
++                              NODHCP="Yes"
++                              export NODHCP
+                               ;;
+ 
+                       ethdevice=*)
+diff --git a/scripts/live-bottom/23networking b/scripts/live-bottom/23networking
+index 9554b77..a29df57 100755
+--- a/scripts/live-bottom/23networking
++++ b/scripts/live-bottom/23networking
+@@ -79,7 +79,7 @@ fi
+ 
+       done
+ else
+-      if [ -z "${NETBOOT}" ] || [ -n "${DHCP}" ]
++      if ( [ -z "${NETBOOT}" ] && [ -z "${NODHCP}" ] ) || [ -n "${DHCP}" ]
+       then
+               # default, dhcp assigned
+               method="dhcp"