cwfs: fix network listener, relay auth errors. boot(8): split bootargs only on first ! char, prepare /net so cwfs can announce 9fs

2 files changed, 5 insertions, 12 deletions

diff --git a/sys/src/9/boot/bootrc b/sys/src/9/boot/bootrc
index 9b6fc6a28..4590c4a38 100644
--- a/sys/src/9/boot/bootrc
+++ b/sys/src/9/boot/bootrc
@@ -70,20 +70,13 @@ fn main{
 		}
 		if not bootargs=$nobootprompt
 		mn=`{echo $bootargs | awk -F! '{print $1}'}
-		ma=`{echo $bootargs | awk -F! '{print $2}'}
+		ma=`{echo $bootargs | sed 's/[^!]+!//'}
 		for(i in `{seq 1 $#mt}){
 			if(~ $mt($i) m^$mn)
 				mp=$$mt($i)
 		}
 	}
 
-	switch($mn){
-	case local
-		islocal=1
-	case hybrid
-		ishybrid=1
-	}
-
 	# config method
 	$mp(1) $ma
 
@@ -149,6 +142,10 @@ if(! ~ $#kbmap 0){
 		cat $"kbmap >/dev/kbmap
 }
 
+# bind in an ip interface
+for(i in I l`{seq 0 3})
+	bind -qa '#'$i /net
+
 configlocal	# add partitions and binds
 
 while(){
diff --git a/sys/src/9/boot/tcp.rc b/sys/src/9/boot/tcp.rc
index 18e45edb2..63a6b56c5 100755
--- a/sys/src/9/boot/tcp.rc
+++ b/sys/src/9/boot/tcp.rc
@@ -1,10 +1,6 @@
 #!/bin/rc
 
 fn configtcp{
-	# bind in an ip interface
-	for(i in I l`{seq 0 3})
-		bind -qa '#'$i /net
-
 	must ip/ipconfig -p $*
 	
 	if(~ $#fs 0)