use mntgen for /mnt and /mnt/exportfs

diff --git a/lib/namespace b/lib/namespace
index 931cd02c5ddc09b6e7bb1115f21c8bb598447d7e..208465fcdc6fb8040aa40d1efbbe9c306d76827d 100644 (file)
--- a/lib/namespace
+++ b/lib/namespace
@@ -14,6 +14,8 @@ bind -a #¤ /dev
 
 # mount points
 mount -a /srv/slashn /n
+mount -a /srv/slashmnt /mnt
+mount -a /srv/mntexport /mnt/exportfs
 
 # authentication
 mount -a /srv/factotum /mnt

diff --git a/rc/bin/cpurc b/rc/bin/cpurc
index c7198b8275313377728173e7935f7a701b35d246..88bfa88f1e824e8937ead93058a721b0c1a3d3c8 100755 (executable)
--- a/rc/bin/cpurc
+++ b/rc/bin/cpurc
@@ -13,6 +13,8 @@ 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
 
 # name translation, cs sets /dev/sysname
 ndb/cs

diff --git a/rc/bin/termrc b/rc/bin/termrc
index 0c8109347aa9fe462e70fefaea238eeb32a4b081..c0632102678b22198d9a08b6cc91912ad5b2cfd1 100755 (executable)
--- a/rc/bin/termrc
+++ b/rc/bin/termrc
@@ -3,6 +3,8 @@
 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 '$' Σ κ)

diff --git a/sys/lib/rootstub b/sys/lib/rootstub
index 61f22ed22031ef61c97d8988ba757cab05278ad0..8beb46c8bb2ea5e37f613ae4df977419f8416eac 100755 (executable)
--- a/sys/lib/rootstub
+++ b/sys/lib/rootstub
@@ -119,48 +119,7 @@ mkdir -p mail/queue
 mkdir -p mail/tmp
 mkdir -p mips/bin/aux
 mkdir -p mips/lib/ape
-mkdir -p mnt/acme
-mkdir -p mnt/apeselect
-mkdir -p mnt/apm
-mkdir -p mnt/arch
-mkdir -p mnt/cd
-mkdir -p mnt/cons
-mkdir -p mnt/cons/cons
-mkdir -p mnt/cons/consctl
-mkdir -p mnt/consoles
-mkdir -p mnt/doc
-mkdir -p mnt/exportfs/0
-mkdir -p mnt/exportfs/1
-mkdir -p mnt/exportfs/10
-mkdir -p mnt/exportfs/11
-mkdir -p mnt/exportfs/12
-mkdir -p mnt/exportfs/13
-mkdir -p mnt/exportfs/14
-mkdir -p mnt/exportfs/15
-mkdir -p mnt/exportfs/16
-mkdir -p mnt/exportfs/2
-mkdir -p mnt/exportfs/3
-mkdir -p mnt/exportfs/4
-mkdir -p mnt/exportfs/5
-mkdir -p mnt/exportfs/6
-mkdir -p mnt/exportfs/7
-mkdir -p mnt/exportfs/8
-mkdir -p mnt/exportfs/9
-mkdir -p mnt/keys
-mkdir -p mnt/lp
-mkdir -p mnt/netkeys
-mkdir -p mnt/news
-mkdir -p mnt/plumb
-mkdir -p mnt/rdb
-mkdir -p mnt/temp
-mkdir -p mnt/term
-mkdir -p mnt/ums
-mkdir -p mnt/vmware
-mkdir -p mnt/web
-mkdir -p mnt/webcookies
-mkdir -p mnt/wiki
-mkdir -p mnt/wrap
-mkdir -p mnt/wsys
+mkdir -p mnt
 mkdir -p n
 mkdir -p power/bin/ape
 mkdir -p power/bin/audio

diff --git a/sys/lib/sysconfig/proto/cdproto b/sys/lib/sysconfig/proto/cdproto
index d5f41132dd21832eeddab4542d67d4ef406c5676..71aa7717f06a4701d5da6ac364d192b31940a6b4 100644 (file)
--- a/sys/lib/sysconfig/proto/cdproto
+++ b/sys/lib/sysconfig/proto/cdproto
@@ -55,32 +55,6 @@ mips d775
 acme   d775
        +
 mnt    d775
-       acme    d555
-       apeselect       d555
-       apm     d555
-       cd      d555
-       cons    d555
-               cons    d555
-               consctl d555
-       consoles        d555
-       doc     d555
-       exportfs        d555
-               *
-       keys    d555
-       lp      d555
-       netkeys d555
-       news    d555
-       plumb   d555
-       rdb     d555
-       temp    d555
-       term    d555
-       ums     d555
-       vmware  d555
-       web     d555
-       webcookies      d555
-       wiki    d555
-       wrap    d555
-       wsys    d555
 n      d775
 sys    d775
        games   d775

diff --git a/sys/src/cmd/vt/consctl.c b/sys/src/cmd/vt/consctl.c
index 525bbb664559c5d9b151bd6b1d076efc82f08f58..6bdf0f46fcf2dbb1469a8a78f58d1cb9aa49f668 100644 (file)
--- a/sys/src/cmd/vt/consctl.c
+++ b/sys/src/cmd/vt/consctl.c
@@ -20,13 +20,13 @@ consctl(void)
                sysfatal("segattach: %r");
 
        /* a pipe to simulate consctl */
-       if(bind("#|", "/mnt/cons/consctl", MBEFORE) < 0
-       || bind("/mnt/cons/consctl/data1", "/dev/consctl", MREPL) < 0)
+       if(bind("#|", "/mnt/consctl", MBEFORE) < 0
+       || bind("/mnt/consctl/data1", "/dev/consctl", MREPL) < 0)
                sysfatal("bind consctl: %r");
 
        /* a pipe to simulate the /dev/cons */
-       if(bind("#|", "/mnt/cons/cons", MREPL) < 0
-       || bind("/mnt/cons/cons/data1", "/dev/cons", MREPL) < 0)
+       if(bind("#|", "/mnt/cons", MREPL) < 0
+       || bind("/mnt/cons/data1", "/dev/cons", MREPL) < 0)
                sysfatal("bind cons: %r");
 
        switch(fork()){