From 02217fa6c273bef9500d875385dab4e7de1dd51e Mon Sep 17 00:00:00 2001
From: cinap_lenrek <cinap_lenrek@rei2.9hal>
Date: Thu, 1 Mar 2012 18:55:42 +0100
Subject: boot: check nousbrc boot parameter, add delay

---
 sys/src/9/boot/bootrc | 8 ++++++--
 sys/src/9/boot/nusbrc | 4 ----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/sys/src/9/boot/bootrc b/sys/src/9/boot/bootrc
index e1c90b508..c2b1bbf63 100644
--- a/sys/src/9/boot/bootrc
+++ b/sys/src/9/boot/bootrc
@@ -161,7 +161,11 @@ if(test -x /bin/aux/kbdfs){
 }
 
 # usb devices
-nusbrc
+if(test -x /bin/nusbrc && ! test -e /env/nousbrc)
+	nusbrc
+
+# wait for devices to settle down
+sleep 2
 
 # add partitions and binds
 configlocal
@@ -209,4 +213,4 @@ while(){
 	nobootprompt=()
 	user=()
 	rm -f /srv/^(cfs boot slashn cs dns)
-} </dev/cons >/dev/cons >[2]/dev/cons 
+} </dev/cons
diff --git a/sys/src/9/boot/nusbrc b/sys/src/9/boot/nusbrc
index c552fe40b..f61826098 100755
--- a/sys/src/9/boot/nusbrc
+++ b/sys/src/9/boot/nusbrc
@@ -1,5 +1,4 @@
 #!/bin/rc
-
 if(! bind -a '#u' /dev)
 	exit
 mkdir -m 0700 '#σc/usb'
@@ -37,6 +36,3 @@ if(! nusb/usbd)
 
 bind -a '#σ/usb' /dev
 
-if(! ~ $#usbdelay 0)
-	sleep $usbdelay
-
-- 
cgit v1.2.3