boot and namespace cleanup

4 files changed, 11 insertions, 21 deletions

diff --git a/rc/bin/cpurc b/rc/bin/cpurc
index b69c42b76..0436b0530 100755
--- a/rc/bin/cpurc
+++ b/rc/bin/cpurc
@@ -71,7 +71,7 @@ if(test -e /cfg/$sysname/cpustart)
 
 # 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|fossil|cs|dns|reboot)$'
+dontkill '^(ipconfig|factotum|mntgen|venti|kfs|cwfs.*|cs|dns|reboot)$'
 
 # echo `{date} $sysname >>/sys/log/boot
 exit ''
diff --git a/rc/bin/cpurc.local b/rc/bin/cpurc.local
index 1a5a45d3e..318406bf9 100755
--- a/rc/bin/cpurc.local
+++ b/rc/bin/cpurc.local
@@ -5,10 +5,11 @@
 # return addresses, even local ones
 site=EXAMPLE
 # replace FILESERVER with the name of your file server
-# here we start with kfs, your local disk file system
-fileserver=kfs
+# 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)
+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 4a652504a..f33df232f 100755
--- a/rc/bin/termrc
+++ b/rc/bin/termrc
@@ -5,11 +5,13 @@ NDBFILE=/lib/ndb/local
 
 mntgen -s slashn && chmod 666 /srv/slashn
 
-# bind all likely devices (#S was bound in boot)
-for(i in f t m v L P u U '$' Σ κ)
-	/bin/bind -a '#'^$i /dev >/dev/null >[2=1]
+# bind all likely devices
+for(i in S f k t m i v L P u U '$' Σ κ)
+	bind -a '#'^$i /dev >/dev/null >[2=1]
 rm -f /env/i
 
+mount -qa /srv/usb /dev
+
 # set up any partitions
 diskparts
 
@@ -110,8 +112,7 @@ if(! ~ $"vgasize '' text none){
 }
 rm -f '/env/fn#ask'
 
-usbstart
 if (test -f /dev/apm)
 	aux/apm
 
-dontkill '^(ipconfig|factotum|mntgen|fossil|kfs|cwfs|cs|dns|listen|reboot)$'
+dontkill '^(ipconfig|factotum|mntgen|fossil|kfs|cwfs.*|cs|dns|listen|reboot)$'
diff --git a/rc/bin/usbstart b/rc/bin/usbstart
deleted file mode 100755
index a021e8901..000000000
--- a/rc/bin/usbstart
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/rc
-# usbstart - start appropriate usb flavour
-if(test -r '#u'/usb) {
-	if(! test -r /dev/usb)
-		bind -a '#u' /dev
-	# /boot/boot may have started usbd, which starts all usb drivers
-	if(test -f /srv/usb)
-		mount -a /srv/usb /dev
-	if not
-		usb/usbd
-}
-exit ''