merge (term cpu)^rc.local with (term cpu)^rc, mount /srv/cons in (term cpu)^rc instead of /lib/namespace as we dont want to have it in every namespace (cpu session).

5 files changed, 14 insertions, 51 deletions

diff --git a/lib/namespace b/lib/namespace
index adc8a29c3..df3e871f0 100755
--- a/lib/namespace
+++ b/lib/namespace
@@ -11,9 +11,6 @@ bind #p /proc
 bind -c #s /srv
 bind -a #¤ /dev
 
-# userspace devices
-mount -qb /srv/cons /dev
-
 # mount points
 mount -a /srv/slashn /n
 
diff --git a/rc/bin/cpurc b/rc/bin/cpurc
index 14db6f6e6..f6bd2eb56 100755
--- a/rc/bin/cpurc
+++ b/rc/bin/cpurc
@@ -3,6 +3,12 @@
 
 date > /env/boottime
 
+for(i in m i P S t u '$')
+	bind -a '#'^$i /dev >/dev/null >[2=1]
+
+mount -qb /srv/cons /dev
+mount -qa /srv/usb /dev
+
 # mount points
 mntgen -s slashn && chmod 666 /srv/slashn
 
@@ -13,10 +19,6 @@ sysname=`{cat /dev/sysname}
 # parallelism for mk
 NPROC = `{wc -l </dev/sysstat}
 
-# site-specific startup
-if(test -e /rc/bin/cpurc.local)
-	. /rc/bin/cpurc.local
-
 if (~ $#sysname 0 || ~ $sysname '') {
 	sysname = cirno			# default
 	echo -n $sysname >/dev/sysname
@@ -49,12 +51,8 @@ auth/cron >>/sys/log/cron >[2=1] &
 #	mv /rc/bin/service/tcp567 /rc/bin/service/_tcp567
 # }
 
-# start listeners if it hasn't already been done (dicey check)
-if(! netstat -n | grep -s 'tcp.*Listen.* (7|9|21|22|23|25|110|113|565|993|17007|17009|17010) .*')
-	aux/listen -q tcp
-# we don't use IL, maybe you do
-if(! netstat -n | grep -v 17008 | grep -s il.*Listen)
-	aux/listen -q il
+# start listeners
+aux/listen -q -t /rc/bin/service.auth -d /rc/bin/service tcp
 
 if(! ps|grep -s timesync) {
 	aux/timesync -n pool.ntp.org
diff --git a/rc/bin/cpurc.local b/rc/bin/cpurc.local
deleted file mode 100755
index d36f4d912..000000000
--- a/rc/bin/cpurc.local
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/rc
-# the 9pccpuf kernel runs this file
-
-# used only by upas, as default return domain appended to all unqualified
-# return addresses, even local ones
-site=EXAMPLE
-# replace FILESERVER with the name of your file server
-# here we start with cwfs, your local disk file system
-fileserver=cwfs
-# replace FACEDOM with the local domain to be used in the faces database
-facedom=FACEDOM
-
-for(i in m i P S t u '$')
-	bind -a '#'^$i /dev >/dev/null >[2=1]
-
-mount -qa /srv/usb /dev
diff --git a/rc/bin/termrc b/rc/bin/termrc
index ec92f330d..8444bfb78 100755
--- a/rc/bin/termrc
+++ b/rc/bin/termrc
@@ -1,7 +1,6 @@
 #!/bin/rc
 # terminal startup
 TIMESYNCARGS=(-rLa1000000)
-NDBFILE=/lib/ndb/local
 
 mntgen -s slashn && chmod 666 /srv/slashn
 
@@ -10,6 +9,7 @@ for(i in S f k t m i v L P u U A '$' Σ κ)
 	bind -a '#'^$i /dev >/dev/null >[2=1]
 rm -f /env/i
 
+mount -qb /srv/cons /dev
 mount -qa /srv/usb /dev
 
 # set up any partitions
@@ -21,20 +21,17 @@ if (! ~ $#disk 0)
 	swap $disk(1) >/dev/null >[2=1]
 rm -f /env/disk
 
-# we do this before we have a name.  we may need to do network
-# setup so that we can get a name.
-if(test -e /rc/bin/termrc.local)
-	. /rc/bin/termrc.local
-
-# cs sets sysname (termrc.local may already have started it so check)
-if(! test -e /srv/cs && ! test -e /net/cs)
-	ndb/cs -f $NDBFILE
+# cs sets sysname
+ndb/cs
 sysname=`{cat /dev/sysname}
 if(~ $#sysname 0 || ~ $sysname ''){
 	sysname=cirno			# default
 	echo -n $sysname >/dev/sysname
 }
 
+# parallelism for mk
+NPROC = `{wc -l </dev/sysstat}
+
 # machine specific startup (e.g., for devices not probed)
 if(test -e /cfg/$sysname/termrc)
 	. /cfg/$sysname/termrc
diff --git a/rc/bin/termrc.local b/rc/bin/termrc.local
deleted file mode 100755
index 526edd9ef..000000000
--- a/rc/bin/termrc.local
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/rc
-# the 9pcf kernel runs this file
-
-# used only by upas, as default return domain appended to all unqualified
-# return addresses, even local ones
-site=plan9
-# replace FILESERVER with the name of your file server
-# here we start with kfs, your local disk file system
-fileserver=kfs
-# replace FACEDOM with the local domain to be used in the faces database
-facedom=FACEDOM
-# replace CPU with the name of your cpu server
-cpu=CPU