From 20ba8815bc00bcf3548547e78d5d2a2e08de8cfd Mon Sep 17 00:00:00 2001
From: cinap_lenrek <cinap_lenrek@felloff.net>
Date: Mon, 1 May 2017 22:50:16 +0200
Subject: inst/configether: in manual network configuration, ask for dns server

---
 rc/bin/inst/configether |  4 ++++
 rc/bin/inst/ndbsetup    | 11 +++++++----
 2 files changed, 11 insertions(+), 4 deletions(-)

diff --git a/rc/bin/inst/configether b/rc/bin/inst/configether
index a12d0823f..f61d464c4 100755
--- a/rc/bin/inst/configether
+++ b/rc/bin/inst/configether
@@ -21,6 +21,10 @@ case go
 		prompt 'network mask'; ipmask=$rd
 		prompt 'gateway address'; gwaddr=$rd
 		export ipaddr ipmask gwaddr
+		if(~ $#DNSSERVER 0){
+			prompt -d $gwaddr 'dns server'; DNSSERVER=$rd
+			export DNSSERVER
+		}
 	}
 	export ethermethod gwaddr ipaddr ipmask dhcphost
 	exec ./startether go
diff --git a/rc/bin/inst/ndbsetup b/rc/bin/inst/ndbsetup
index ad795d9e5..6824c9192 100755
--- a/rc/bin/inst/ndbsetup
+++ b/rc/bin/inst/ndbsetup
@@ -28,15 +28,18 @@ case go
 	cp /n/newfs/lib/ndb/local /tmp/ndb.local
 	{
 		ssam 'x/^.*ether='^$etheraddr^'.*$/ d' /tmp/ndb.local
+		
+		se = ('sys='^$sysname 'ether='^$etheraddr)
 
 		echo
 		switch($ethermethod){
 		case dhcp
-			echo 'sys='^$sysname 'ether='^$etheraddr
-
+			echo $se
 		case manual
-			echo 'sys='^$sysname 'ether='^$etheraddr \
-				'ip='^$ipaddr 'ipmask='^$ipmask 'ipgw='^$gwaddr
+			echo $se 'ip='^$ipaddr 'ipmask='^$ipmask 'ipgw='^$gwaddr
+			if(! ~ $#DNSSERVER 0){
+				echo '	'	'dns='^$DNSSERVER
+			}
 		}
 		echo
 	} >/n/newfs/lib/ndb/local
-- 
cgit v1.2.3