xfnw/plan9fox
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

similar to my last commit, but combined the two waits for the usb devices. still configurable, but with usbwait. If usbwait is not defined then it defaults to the original 2 seconds.

Browse source
This commit is contained in:
Matthew Veety 2014-02-14 00:11:11 -05:00
parent 1d64be1984
commit 3f9d92c1a8
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
sys/src/9/boot/bootrc
View file

@ -58,8 +58,6 @@ fn ask {
} }
mt=() mt=()
. /rc/lib/net.rc
. /rc/lib/local.rc
fn main{ fn main{
mp=() mp=()
@ -169,7 +167,13 @@ if(test -x /bin/nusbrc && ! test -e /env/nousbrc)
nusbrc nusbrc
# wait for devices to settle down # wait for devices to settle down
sleep 2 if(~ $#usbwait 1)
sleep $usbwait
if(~ $#usbwait 0)
sleep 2
. /rc/lib/net.rc
. /rc/lib/local.rc
# add partitions and binds # add partitions and binds
configlocal configlocal

3
sys/src/9/boot/net.rc
View file

@ -1,9 +1,6 @@
#!/bin/rc #!/bin/rc
fn confignet{ fn confignet{
if(~ $#netwait 1)
sleep $netwait
must ip/ipconfig -p $* must ip/ipconfig -p $*
if(~ $#fs 0) if(~ $#fs 0)
fs=`{awk -F'=' '/fs=/{print $2; exit}' /net/ndb} fs=`{awk -F'=' '/fs=/{print $2; exit}' /net/ndb}