add /net/ndb to default ndb database files, fix mistakes

8 files changed, 8 insertions, 47 deletions

diff --git a/.hgignore b/.hgignore
index 981e8053b..072cde037 100644
--- a/.hgignore
+++ b/.hgignore
@@ -5,9 +5,8 @@ syntax: regexp
 ^sys/lib/python/.*\.(pyo|pyc|exe)$
 ^sys/log/
 ^sys/man/(searchindex|[1-8]/INDEX.*)$
-^(dev|fd|net|srv|env|root|boot|mnt|n|bin|tmp)/
+^(dev|fd|net|srv|env|root|boot|mnt|n|bin|usr|cfg|tmp)/
 ^(386|68000|68020|alpha|amd64|arm|power|power64|sparc|sparc64)/(bin|lib)/
 ^386/(9(pc|boot).*|pbs|mbr|init)
 ^acme/bin/(386|68000|68020|alpha|amd64|arm|power|power64|sparc|sparc64)/
 ^lib/audio/
-^usr/
diff --git a/cfg/cirno/cpurc b/cfg/cirno/cpurc
deleted file mode 100755
index ced742b08..000000000
--- a/cfg/cirno/cpurc
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/rc
-# the 9pccpuf kernel runs this file
-
-# example: adjust to fit your network
-#ip/ipconfig -g 192.168.0.1 ether /net/ether0 192.168.0.2 255.255.255.0
-#ndb/dns -rs
-#aux/timesync -Ln pool.ntp.org
-
-# outgoing mail will appear to originate from this domain
-#site=9front
diff --git a/cfg/cirno/cpustart b/cfg/cirno/cpustart
deleted file mode 100644
index 3b9b5a507..000000000
--- a/cfg/cirno/cpustart
+++ /dev/null
@@ -1,17 +0,0 @@
-# the 9pccpuf kernel runs this file
-
-aux/listen -q -t /rc/bin/service.auth -d /rc/bin/service tcp
-
-@{
-	rfork n
-	if(~ $monitor vesa)
-		aux/realemu
-	aux/vga -l $vgasize
-}
-switch($mouseport){
-case ps2 ps2intellimouse 0 1 2
-	aux/mouse $mouseport
-	if(~ $accupoint 1)
-		pipefile -dr /bin/aux/accupoint /dev/mouse
-}
-exec rio
diff --git a/cfg/cirno/termrc b/cfg/cirno/termrc
deleted file mode 100644
index bfcebb4f6..000000000
--- a/cfg/cirno/termrc
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/rc
-# the 9pcf kernerl runs this file
-
-# example: adjust to fit your network
-#ip/ipconfig -g 192.168.0.1 ether /net/ether0 192.168.0.2 255.255.255.0
-#ndb/dns -r
-#aux/timesync -Ln pool.ntp.org
-
-# outgoing mail will appear to originate from this domain
-#site=9front
diff --git a/lib/ndb/local b/lib/ndb/local
index f7b21282b..dc94031eb 100644
--- a/lib/ndb/local
+++ b/lib/ndb/local
@@ -2,6 +2,7 @@
 #  files comprising the database, use as many as you like, see ndb(6)
 #
 database=
+	file=/net/ndb
 	file=/lib/ndb/local
 	file=/lib/ndb/common
 
diff --git a/rc/bin/cpurc b/rc/bin/cpurc
index 0c8c8beb1..bd3e6c96d 100755
--- a/rc/bin/cpurc
+++ b/rc/bin/cpurc
@@ -44,7 +44,7 @@ if(! test -e /srv/dns)
 
 if(! ps|grep -s timesync){
 	if(~ $#ntp 0)
-		eval `{ndb/ipquery sys $sysname ntp}
+		. <{ndb/ipquery sys $sysname ntp | sed 's, +,\n,g'}
 	if(~ $#ntp 0)
 		ntp=pool.ntp.org
 	aux/timesync -n $ntp
@@ -52,7 +52,7 @@ if(! ps|grep -s timesync){
 }
 
 if(~ $#auth 0)
-	eval `{ndb/ipquery sys $sysname auth}
+	. <{ndb/ipquery sys $sysname auth | sed 's, +,\n,g'}
 switch($auth){
 case `{	echo $sysname; ndb/query sys $sysname dom
 	for(i in `{awk '/u\ *$/{print $1}' /net/ipselftab}){
@@ -66,12 +66,9 @@ case *
 	aux/listen -q -d /rc/bin/service tcp
 }
 
-# cpu-specific late startup
-if(test -e /cfg/$sysname/cpustart)
-	. /cfg/$sysname/cpustart
+if(test -f /dev/apm)
+	aux/apm
 
 # mode of /proc/*/ctl is inherited across rfork, and sets modes on
 # other /proc files, such as note, so let listen be killed.
 dontkill '^(ipconfig|factotum|mntgen|venti|kfs|cwfs.*|cs|dns|reboot)$'
-
-exit ''
diff --git a/rc/bin/termrc b/rc/bin/termrc
index e30809719..42d38508e 100755
--- a/rc/bin/termrc
+++ b/rc/bin/termrc
@@ -41,7 +41,7 @@ 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
+		ip/ipconfig -N >[2]/dev/null || ip/ipconfig
 	}
 	rm -f /env/ether
 }
diff --git a/sys/lib/rootstub b/sys/lib/rootstub
index 0145cc0cd..a487e7ee6 100755
--- a/sys/lib/rootstub
+++ b/sys/lib/rootstub
@@ -102,6 +102,7 @@ mkdir -p arm/bin/upas
 mkdir -p arm/bin/usb
 mkdir -p arm/bin/venti
 mkdir -p arm/lib/ape
+mkdir -p cfg
 mkdir -p cron
 mkdir -p dist/plan9front
 mkdir -p fd