1 #! /bin/sh /usr/share/dpatch/dpatch-run
2 ## 16_always_honor_nodhcp.dpatch by Ulrich Dangel<mru@grml.org>
4 ## All lines beginning with `## DP:' are a description of the patch.
5 ## DP: Always honor the nodhcp boot option
9 diff --git a/scripts/live b/scripts/live
10 index d79beed..0b698de 100755
13 @@ -83,7 +83,8 @@ Arguments ()
23 diff --git a/scripts/live-bottom/23networking b/scripts/live-bottom/23networking
24 index 9554b77..a29df57 100755
25 --- a/scripts/live-bottom/23networking
26 +++ b/scripts/live-bottom/23networking
31 - if [ -z "${NETBOOT}" ] || [ -n "${DHCP}" ]
32 + if ( [ -z "${NETBOOT}" ] && [ -z "${NODHCP}" ] ) || [ -n "${DHCP}" ]
34 # default, dhcp assigned