Commit b88a8daf authored by Evgeni Golov's avatar Evgeni Golov Committed by Raphaël Hertzog

fix nodhcp option to actually force DHCP off

patch based on the one in Grml and the input of Frank Lillo

Thanks: Frank Lillo <frank.lillo@gecoinc.com>
Closes: #785345
parent 061976c3
......@@ -33,6 +33,8 @@ Cmdline_old ()
nodhcp)
DHCP=""
export DHCP
NODHCP="true"
export NODHCP
;;
ethdevice=*)
......
......@@ -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"
......
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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment