fix bugs and cleanup cryptsetup code

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

diff --git a/sys/src/9/boot/bootrc b/sys/src/9/boot/bootrc
index 208122f7278aa98898bc1ad94530e4f09b49fa1f..cf712609a258f088717119fe28b966893a456d5a 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
 
@@ -66,7 +70,7 @@ fn main{
                if(~ $#nobootprompt 0){
                        echo
                        showlocaldevs
-                       ask bootargs ' is (tcp, il, local!device)' $"bootargs
+                       ask bootargs ' is (tcp, tls, il, local!device)' $"bootargs
                }
                if not bootargs=$nobootprompt
                nobootprompt=()
@@ -175,12 +179,6 @@ 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
-
 # load boot methods
 fn showlocaldevs {}
 fn configlocal {}
@@ -235,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