merge

sys/src/9/boot/local.rc

@@ -45,7 +45,7 @@ fn configlocal{
 }
 
 fn bootfs{
-	{$1 -s -f $*(2-) &} <[0=1] | echo 0 >/srv/boot
+	{$1 -s -f $*(2-) <[0=1] &} | echo 0 >/srv/boot
 }
 
 fn connectlocal{

sys/src/9/boot/nusbrc

@@ -45,7 +45,7 @@ if(! nusb/usbd)
 						diskparts $dev
 						for(part in $dev/dos* $dev/9fat* $dev/data) if(test -r $part && ~ `{fstype $part} dos) {
 							mkdir -m 0700 '#σc/'^$dev || exit
-							{dossrv -s -f $part &} <[0=1] |
+							{dossrv -s -f $part <[0=1] &} |
 								echo 0 >'#σc/'^$dev/dos
 							exit
 						}

sys/src/9/port/devshr.c

@@ -554,6 +554,7 @@ shrremove(Chan *c)
 	Sch *sch;
 	Mpt *mpt;
 	Mhead *h;
+	Chan *bc;
 
 	sch = tosch(c);
 	if(waserror()){
@@ -593,6 +594,7 @@ shrremove(Chan *c)
 		qunlock(&shrslk);
 		break;
 	case Qcmpt:
+		bc = nil;
 		mpt = sch->mpt;
 		m = &mpt->m;
 		h = &shr->umh;
@@ -601,10 +603,14 @@ shrremove(Chan *c)
 			if(*ml == m){
 				*ml = m->next;
 				m->next = nil;
+				bc = m->to;
+				m->to = nil;
 				putmpt(mpt);
 				break;
 			}
 		wunlock(&h->lock);
+		if(bc != nil)
+			cclose(bc);
 		break;
 	}
 	poperror();