ref: 747869bd7114665161e659957b3f2dbacca80aea
parent: 4e2056d1acde2511577dad5e990c90b2a73b778d
author: cinap_lenrek <cinap_lenrek@centraldogma>
date: Thu Dec 1 21:29:41 EST 2011
move factotum from /mnt to /mnt/factotum
--- a/rc/bin/cpurc
+++ b/rc/bin/cpurc
@@ -8,14 +8,20 @@
mount -qb /srv/cons /dev
-# usb listener
-nusbrc
-
# mount points
mntgen -s slashn && chmod 666 /srv/slashn
mntgen -s slashmnt /mnt && chmod 666 /srv/slashmnt
mntgen -s mntexport /mnt/exportfs && chmod 666 /srv/mntexport
+# move factotum from /mnt to /mnt/factotum
+mount /srv/factotum /mnt/temp
+unmount /srv/factotum /mnt
+bind /mnt/temp/factotum /mnt/factotum
+unmount /mnt/temp
+
+# usb listener
+nusbrc
+
# name translation, cs sets /dev/sysname
ndb/cs
sysname=`{cat /dev/sysname}@@ -68,11 +74,6 @@
} | sed 's,[^ ]+=,,g'}}
# cpu+auth server
-
- # prevent factotum deadlock
- aux/stub -d /mnt/keys
- aux/stub -d /mnt/netkeys
-
auth/keyfs -wp -m /mnt/keys /adm/keys
aux/listen -q -t /rc/bin/service.auth -d /rc/bin/service tcp
case *
--- a/rc/bin/termrc
+++ b/rc/bin/termrc
@@ -2,10 +2,6 @@
# terminal startup
TIMESYNCARGS=(-rLa1000000)
-mntgen -s slashn && chmod 666 /srv/slashn
-mntgen -s slashmnt /mnt && chmod 666 /srv/slashmnt
-mntgen -s mntexport /mnt/exportfs && chmod 666 /srv/mntexport
-
# bind all likely devices
for(i in S f k t m i v L P u U A '$' Σ κ)
bind -a '#'^$i /dev >/dev/null >[2=1]
@@ -12,6 +8,17 @@
rm -f /env/i
mount -qb /srv/cons /dev
+
+# mount points
+mntgen -s slashn && chmod 666 /srv/slashn
+mntgen -s slashmnt /mnt && chmod 666 /srv/slashmnt
+mntgen -s mntexport /mnt/exportfs && chmod 666 /srv/mntexport
+
+# move factotum from /mnt to /mnt/factotum
+mount /srv/factotum /mnt/temp
+unmount /srv/factotum /mnt
+bind /mnt/temp/factotum /mnt/factotum
+unmount /mnt/temp
# usb listener
nusbrc
--
⑨