merge

sys/man/8/plan9.ini

@@ -712,6 +712,12 @@ Suppress the
 prompt and use
 .I value
 as the answer instead.
+.SS \fLbootloop=\fIvalue\fP
+Always use
+.I value
+as the answer to the
+.L bootargs
+prompt, retrying if unsuccessful.
 .SS \fLrootdir=\fB/root/\fIdir\fP
 .SS \fLrootspec=\fIspec\fP
 Changes the mount arguments for the root file server

sys/src/9/boot/bootrc

@@ -68,6 +68,11 @@ mt=()
 fn main{
 	mp=()
 	while(~ $#mp 0){
+		if(! ~ $#bootloop 0){
+			nobootprompt=$bootloop
+			# 'flatten' for the next boot
+			echo -n $bootloop > '#ec/bootloop'
+		}
 		if(~ $#nobootprompt 0){
 			echo
 			showlocaldevs

sys/src/9/boot/reboot.rc

@@ -32,6 +32,7 @@ fn connectreboot {
 
 		# set new kernel parameters
 		echo -n $bootargs > '#ec/bootargs'
+		rm -f '#ec/bootloop'
 
 		# remove part of our temporary root
 		/mnt/broot/$cputype/bin/unmount /$cputype/bin /bin

sys/src/9/port/dev.c

@@ -262,7 +262,7 @@ devwalk(Chan *c, Chan *nc, char **name, int nname, Dirtab *tab, int ntab, Devgen
 		if(strcmp(n, "..") == 0){
 			if((*gen)(nc, nil, tab, ntab, DEVDOTDOT, &dir) != 1){
 				print("devgen walk .. in dev%s %llux broken\n",
-					devtab[nc->type]->name, nc->qid.path);
+					devtab[c->type]->name, c->qid.path);
 				error("broken devgen");
 			}
 			nc->qid = dir.qid;

sys/src/9/port/devskel.c

@@ -9,15 +9,15 @@
 
 typedef struct Skel Skel;
 struct Skel {
+	RWlock;
 	int ref;
-	QLock lk;
 	char name[KNAMELEN];
 	char mode;
 };
 
 struct
 {
-	QLock lk;
+	QLock;
 	ulong path;
 } skelalloc;
 
@@ -36,19 +36,26 @@ skelattach(char *spec)
 
 	c = devattach('z', spec);
 
-	f = smalloc(sizeof *f);
+	f = mallocz(sizeof *f, 1);
-	if(spec != nil && spec[0] != '\0' && strchr("de", spec[0]) != nil)
+	if(f == nil)
-		f->mode = spec[0];
+		exhausted("memory");
-	else
+	if(waserror()){
+		free(f);
+		nexterror();
+	}
+
+	if(spec == nil)
 		f->mode = 'f';
+	else
+		f->mode = spec[0];
 
-	f->ref = 1;
+	eqlock(&skelalloc);
-
-	qlock(&skelalloc.lk);
 	path = skelalloc.path++;
-	qunlock(&skelalloc.lk);
+	qunlock(&skelalloc);
 
-	mkqid(&c->qid, NETQID(path, Qroot), 0, QTDIR);
+	poperror();
+	mkqid(&c->qid, NETQID(path, Qroot), path, QTDIR);
+	f->ref = 1;
 	c->aux = f;
 	return c;
 }
@@ -59,19 +66,25 @@ step(Chan *c, Dir *dp, int direction)
 	Skel *f;
 	Qid qid;
 	ulong perm;
-	uvlong path;
+	int path;
 	char *name;
 
 	perm = 0555|DMDIR;
 	path = NETTYPE(c->qid.path);
 	f = c->aux;
+	rlock(f);
+	if(waserror()){
+		runlock(f);
+		return -1;
+	}
 	name = f->name;
 
 	path += direction;
-	if(!f->name[0] && path != Qroot)
+	if(!f->name[0] && path > Qroot)
-		return -1;
+		error(Enonexist);
 
 	switch(path){
+	case Qroot-1:
 	case Qroot:
 		mkqid(&qid, Qroot, 0, QTDIR);
 		name = "#z";
@@ -92,11 +105,14 @@ step(Chan *c, Dir *dp, int direction)
 		}
 		break;
 	default:
-		return -1;
+		error(Enonexist);
 	}
 
-	qid.path = NETQID(NETID(c->qid.path), qid.path);
+	qid.vers = NETID(c->qid.path);
+	qid.path = NETQID(qid.vers, qid.path);
 	devdir(c, qid, name, 0, eve, perm, dp);
+	runlock(f);
+	poperror();
 	return 1;
 }
 
@@ -106,13 +122,22 @@ skelgen(Chan *c, char *name, Dirtab *, int, int s, Dir *dp)
 {
 	Skel *f;
 
-	f = c->aux;
+	switch(s){
-	//First walk away from root
+	case DEVDOTDOT:
-	if(name && !f->name[0] && f->mode != 'e' && NETTYPE(c->qid.path) == Qroot)
+		break;
-		utfecpy(f->name, &f->name[sizeof f->name-1], name);
+	case 0:
-
-	if(s != DEVDOTDOT)
 		s++;
+		break;
+	default:
+		return -1;
+	}
+	f = c->aux;
+	if(name && NETTYPE(c->qid.path) == Qroot){
+		wlock(f);
+		if(!f->name[0] && f->mode != 'e')
+			utfecpy(f->name, &f->name[sizeof f->name-1], name);
+		wunlock(f);
+	}
 
 	return step(c, dp, s);
 }
@@ -123,21 +148,16 @@ skelwalk(Chan *c, Chan *nc, char **name, int nname)
 	Walkqid *wq;
 	Skel *f;
 
-	f = c->aux;
-	qlock(&f->lk);
-	if(waserror()){
-		qunlock(&f->lk);
-		nexterror();
-	}
-
 	wq = devwalk(c, nc, name, nname, nil, 0, skelgen);
-	if(wq != nil && wq->clone != nil && wq->clone != c){
+	if(wq == nil || wq->clone == nil)
+		return wq;
+
+	f = c->aux;
+	wlock(f);
 	if(f->ref <= 0)
 		panic("devskel ref");
 	f->ref++;
-	}
+	wunlock(f);
-	qunlock(&f->lk);
-	poperror();
 	return wq;
 }
 
@@ -161,53 +181,35 @@ skelclose(Chan *c)
 	Skel *f;
 
 	f = c->aux;
-	qlock(&f->lk);
+	wlock(f);
 	f->ref--;
 	if(f->ref == 0){
-		qunlock(&f->lk);
+		wunlock(f);
 		free(f);
 	} else
-		qunlock(&f->lk);
+		wunlock(f);
 }
 
 static long
 skelread(Chan *c, void *va, long n, vlong)
 {
-	Skel *f;
+	return devdirread(c, va, n, nil, 0, skelgen);
-	long nout;
-
-	if(!(c->qid.type & QTDIR))
-		error(Eperm);
-
-	f = c->aux;
-	qlock(&f->lk);
-	if(waserror()){
-		qunlock(&f->lk);
-		nexterror();
-	}
-	nout = devdirread(c, va, n, nil, 0, skelgen);
-	qunlock(&f->lk);
-	poperror();
-	return nout;
 }
 
 static long
 skelwrite(Chan*, void*, long, vlong)
 {
-	error(Eperm);
+	error(Ebadusefd);
-	return 0;
+	return -1;
 }
 
 static int
 skelstat(Chan *c, uchar *db, int n)
 {
-	Skel *f;
 	Dir dir;
 
-	f = c->aux;
+	if(step(c, &dir, 0) < 0)
-	qlock(&f->lk);
+		error(Enonexist);
-	step(c, &dir, 0);
-	qunlock(&f->lk);
 
 	n = convD2M(&dir, db, n);
 	if(n < BIT16SZ)