From d78b83bdfc3162b7746e9456bb74ad57c0451385 Mon Sep 17 00:00:00 2001
From: ment <thement@ibawizard.net>
Date: Sat, 30 Apr 2011 17:06:05 +0200
Subject: [PATCH] boot: mountpoint fix

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

diff --git a/sys/src/9/boot/bootrc b/sys/src/9/boot/bootrc
index 93779bd73..ccf864736 100644
--- a/sys/src/9/boot/bootrc
+++ b/sys/src/9/boot/bootrc
@@ -147,7 +147,7 @@ if(! ~ $#kbmap 0){
 for(i in I l`{seq 0 3})
 	bind -qa '#'$i /net
 
-configusb	# run partfs on usb disks
+configusb		# run partfs on usb disks
 configlocal	# add partitions and binds
 
 while(){
@@ -157,5 +157,5 @@ while(){
 	# cleanup so it can be restarted
 	nobootprompt=()
 	user=()
-	rm -f /srv/boot /srv/slashn /srv/cs /srv/dns
+	rm -f /srv/boot /srv/dosusb /srv/slashn /srv/cs /srv/dns
 }
diff --git a/sys/src/9/boot/usb.rc b/sys/src/9/boot/usb.rc
index 2e5b09a6a..659cdf817 100644
--- a/sys/src/9/boot/usb.rc
+++ b/sys/src/9/boot/usb.rc
@@ -7,14 +7,14 @@ fn configusb{
 }
 
 fn connectusb{
-	m=/mnt/usb
+	m=/mnt/dosusb
 	if(! test -r $1)
 		fatal device $1 does not exist
 	if(! test -r $1/dos)
-		fatal device $1 does not have dos partition
+		fatal device $1 does not have a dos partition
 	mkdir -p $m
-	dossrv -r -f $1/dos usb
-	mount /srv/usb $m
+	dossrv -r -f $1/dos dosusb
+	mount /srv/dosusb $m
 	if(! test -r $m/9front.iso)
 		fatal $m/9front.iso not found
 	{9660srv -s -f $m/9front.iso &} <[0=1] | echo 0 >/srv/boot