From c9dc319649bd11aabbc3c235a0a9f94a70b4a452 Mon Sep 17 00:00:00 2001
From: cinap_lenrek <cinap_lenrek@centraldogma>
Date: Thu, 9 Jun 2011 04:56:16 +0000
Subject: remove bootes, fix inst/authsetup, use ndb for ipconfig before trying
 dhcp

---
 rc/bin/termrc | 24 +++++++++++-------------
 1 file changed, 11 insertions(+), 13 deletions(-)

(limited to 'rc/bin/termrc')

diff --git a/rc/bin/termrc b/rc/bin/termrc
index 8444bfb78..e30809719 100755
--- a/rc/bin/termrc
+++ b/rc/bin/termrc
@@ -36,19 +36,17 @@ NPROC = `{wc -l </dev/sysstat}
 if(test -e /cfg/$sysname/termrc)
 	. /cfg/$sysname/termrc
 
-# start IP on the LAN, if not already configured.  diskless terminals
-# are already configured by now.  It's commented out to avoid a long timeout
-# on startup waiting for DHCP.
-#
-# If your site provides DHCP service,
-#
-#if(! test -e /net/ipifc/0/ctl)
-#	ip/ipconfig
-#
-# Otherwise, see /cfg/$sysname/termrc (/cfg/example/termrc is an example).
+# automatic ip address setup
+if(! grep u /net/ipselftab | grep -sv 127.0.0.1){
+	ether=`{ndb/query sys $sysname ether}
+	if(~ $#ether 1){
+		# try /lib/ndb first, then do dhcp
+		ip/ipconfig -N || ip/ipconfig
+	}
+	rm -f /env/ether
+}
 
-# start dns if we have an internet
-if(test -e /net/ipifc/0/ctl && ! test -e /srv/dns)
+if(! test -e /srv/dns)
 	ndb/dns -r
 
 if(! ~ $terminal *vx32*){
@@ -100,7 +98,7 @@ if(! ~ $"vgasize '' text none){
 }
 rm -f '/env/fn#ask'
 
-if (test -f /dev/apm)
+if(test -f /dev/apm)
 	aux/apm
 
 dontkill '^(ipconfig|factotum|mntgen|kfs|cwfs.*|cs|dns|listen|reboot)$'
-- 
cgit v1.2.3