usbd: intoruce /env/usbbusy

[plan9front.git] / sys / src / 9 / boot / net.rc

diff --git a/sys/src/9/boot/net.rc b/sys/src/9/boot/net.rc
index 8cb05e76b93063aa312875b7d5a79259361f8132..fb399ef9732303c92ff005618e622a758a11129c 100755 (executable)
--- a/sys/src/9/boot/net.rc
+++ b/sys/src/9/boot/net.rc
@@ -17,24 +17,41 @@ fn confignet{
 
        must ip/ipconfig -p $*
        if(~ $#fs 0)
-               fs=`{awk -F'=' '/fs=/{print $2; exit}' /net/ndb}
+               fs=`{awk -F'=' '/^[     ]*fs=/{print $2}' /net/ndb}
        if(~ $#auth 0)
-               auth=`{awk -F'=' '/auth=/{print $2; exit}' /net/ndb}
+               auth=`{awk -F'=' '/^[   ]*auth=/{print $2}' /net/ndb}
        if(~ $#fs 0)
-               ask fs ' ip is? ' $auth
-       if(~ $#auth 0){
-               ask auth ' ip is? ' $fs
-               if(~ $#auth 1)
-                       echo '  auth='^$auth >>/net/ndb
+               ask fs ' address is? ' $auth(1)
+       if(~ $#auth 0)
+               ask auth ' address is? ' $fs(1)
+
+       # resolve dns names
+       if(test -x /bin/ndb/dnsgetip){
+               for(i in fs auth secstore){
+                       x=`{for(x in $$i) ndb/dnsgetip -a $x}
+                       ~ $#x 0 || $i=$x
+               }
+       }
+
+       # set bootstrap authservers for factotum
+       if(! ~ $#auth 0){
+               grep -v '^[     ]*auth=' /net/ndb >/env/x
+               cat /env/x <{echo '     auth='^$auth^'
+'} >/net/ndb
+               rm /env/x
        }
 }
 
 fn connecttcp{
-       srv -q tcp!$fs!564 boot 
+       while(! ~ $#fs 0 && ! srv -q tcp!$fs(1)^!564 boot)
+               fs=$fs(2-);
+       fs=$fs(1)
 }
 
 fn connectil{
-       srv -q il!$fs!17008 boot 
+       while(! ~ $#fs 0 && ! srv -q il!$fs(1)^!17008 boot)
+               fs=$fs(2-);
+       fs=$fs(1)
 }
 
 mtcp=(confignet connecttcp)