provide /n and /mnt early in bootrc to allow consistent use in /lib/namespace

[plan9front.git] / sys / src / 9 / boot / bootrc

diff --git a/sys/src/9/boot/bootrc b/sys/src/9/boot/bootrc
index ed949ec9176b34f636f4a7d0c436aa4bbf9da182..b8c96cc171c9227c8943270e75395b67f2af3013 100755 (executable)
--- a/sys/src/9/boot/bootrc
+++ b/sys/src/9/boot/bootrc
@@ -1,6 +1,10 @@
 #!/bin/rc
 
-mntgen -s slash /mnt
+# mount points
+mntgen -s slashn /n && chmod 666 /srv/slashn
+mntgen -s slashmnt /mnt && chmod 666 /srv/slashmnt
+mntgen -s mntexport /mnt/exportfs && chmod 666 /srv/mntexport
+
 bind /root /mnt/broot
 unmount /root
 
@@ -70,8 +74,9 @@ fn main{
                }
                if not bootargs=$nobootprompt
                nobootprompt=()
-               mn=`{echo $bootargs | awk -F! '{print $1}'}
-               ma=`{echo $bootargs | sed 's/[^!]*!?//'}
+               mn=`{echo $bootargs | sed 's,!, ,'}
+               ma=$mn(2-)
+               mn=$mn(1)
                switch(m$"mn){
                case $mt
                        mp=m$mn
@@ -174,14 +179,12 @@ if(test -x /bin/aux/kbdfs){
 if(test -x /bin/nusbrc && ! test -e /env/nousbrc)
        nusbrc
 
-# wait for devices to settle down
-if(~ $#usbwait 1)
-       sleep $usbwait
-if(~ $#usbwait 0)
-       sleep 2
-
-. /rc/lib/net.rc
-. /rc/lib/local.rc
+# load boot methods
+fn showlocaldevs {}
+fn configlocal {}
+for(i in /rc/lib/*.rc){
+       . $i
+}
 
 # add partitions and binds
 configlocal
@@ -230,5 +233,5 @@ while(){
 
        # cleanup so it can be restarted
        nobootprompt=()
-       rm -f /srv/^(cfs boot slashn cs dns)
+       rm -f /srv/^(cfs boot cs dns)
 } </dev/cons