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

merge

Browse source
This commit is contained in:
cinap_lenrek 2020-03-08 20:55:58 +01:00
commit 11628e90fb
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
sys/src/9/boot/local.rc
View file

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

2
sys/src/9/boot/nusbrc
View file

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

6
sys/src/9/port/devshr.c
View file

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