don't mess around with kernel/initramfs-tools' ip=

[live-boot-grml.git] / debian / patches / 16_always_honor_nodhcp.dpatch

diff --git a/debian/patches/16_always_honor_nodhcp.dpatch b/debian/patches/16_always_honor_nodhcp.dpatch
deleted file mode 100755 (executable)
index 80a2522..0000000
--- a/debian/patches/16_always_honor_nodhcp.dpatch
+++ /dev/null
@@ -1,35 +0,0 @@
-#! /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"