From: Evgeni Golov Date: Tue, 15 Dec 2015 07:21:26 +0000 (+0100) Subject: fix nodhcp option to actually force DHCP off X-Git-Tag: debian/1%20170112~4 X-Git-Url: http://git.grml.org/?a=commitdiff_plain;h=b88a8daf9afb800e4ebee799b82e921a216b6e53;p=live-boot-grml.git fix nodhcp option to actually force DHCP off patch based on the one in Grml and the input of Frank Lillo Thanks: Frank Lillo Closes: #785345 --- diff --git a/components/9990-cmdline-old b/components/9990-cmdline-old index 1549bb4..a565ce1 100755 --- a/components/9990-cmdline-old +++ b/components/9990-cmdline-old @@ -33,6 +33,8 @@ Cmdline_old () nodhcp) DHCP="" export DHCP + NODHCP="true" + export NODHCP ;; ethdevice=*) diff --git a/components/9990-netbase.sh b/components/9990-netbase.sh index 70f97b8..04a4ae4 100755 --- a/components/9990-netbase.sh +++ b/components/9990-netbase.sh @@ -80,7 +80,11 @@ EOF fi done else - if [ -z "${NETBOOT}" ] || [ -n "${DHCP}" ] + if [ -n "${NODHCP}" ] + then + # force DHCP off + method="manual" + elif [ -z "${NETBOOT}" ] || [ -n "${DHCP}" ] then # default, dhcp assigned method="dhcp" diff --git a/debian/changelog b/debian/changelog index 3ebe79f..acae698 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,9 @@ live-boot (1:20170112) unstable; urgency=medium + [ Raphaël Hertzog ] * Team upload. + * Fix nodhcp option to actually force DHCP off. Closes: #785345 + Thanks to Frank Lillo for the report and Evgeni Golov for the patch. [ Kristian Klausen ] * Add "nls_ascii" module in the initrd so that we can access FAT