debian/patches/16_always_honor_nodhcp.dpatch

   1 #! /bin/sh /usr/share/dpatch/dpatch-run
   2 ## 16_always_honor_nodhcp.dpatch by Ulrich Dangel<mru@grml.org>
   3 ##
   4 ## All lines beginning with `## DP:' are a description of the patch.
   5 ## DP: Always honor the nodhcp boot option
   6
   7 @DPATCH@
   8
   9 diff --git a/scripts/live b/scripts/live
  10 index d79beed..0b698de 100755
  11 --- a/scripts/live
  12 +++ b/scripts/live
  13 @@ -83,7 +83,8 @@ Arguments ()
  14                                 ;;
  15
  16                         nodhcp)
  17 -                               unset DHCP
  18 +                               NODHCP="Yes"
  19 +                               export NODHCP
  20                                 ;;
  21
  22                         ethdevice=*)
  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
  27 @@ -79,7 +79,7 @@ fi
  28
  29         done
  30  else
  31 -       if [ -z "${NETBOOT}" ] || [ -n "${DHCP}" ]
  32 +       if ( [ -z "${NETBOOT}" ] && [ -z "${NODHCP}" ] ) || [ -n "${DHCP}" ]
  33         then
  34                 # default, dhcp assigned
  35                 method="dhcp"