Bug#785345: patch
control: tags -1 + patch
patch attached :)
--
Bruce Schneier can read and understand Perl programs.
>From 054326a580c413f1a1233967aabe3eaab5cce4a6 Mon Sep 17 00:00:00 2001
From: Evgeni Golov <evgeni@debian.org>
Date: Tue, 15 Dec 2015 08:21:26 +0100
Subject: [PATCH] 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
---
components/9990-cmdline-old | 2 ++
components/9990-netbase.sh | 6 +++++-
2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/components/9990-cmdline-old b/components/9990-cmdline-old
index efb33c1..12da929 100755
--- a/components/9990-cmdline-old
+++ b/components/9990-cmdline-old
@@ -28,6 +28,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"
--
2.5.0
Reply to: