Browse Source

Plan 9 from Bell Labs 2003-11-04

David du Colombier 18 years ago
parent
commit
1cdde4a51f

+ 3 - 3
dist/replica/network

@@ -10,9 +10,9 @@ fn servermount {
 }
 fn serverupdate { status='' }
 
-fn clientmount { 9fs kfs }
-c=/n/kfs/dist/replica
-clientroot=/n/kfs
+fn clientmount { 9fs boot }
+c=/n/boot/dist/replica
+clientroot=/n/boot
 clientdb=$c/client/plan9.db
 clientexclude=(dist/replica/client)
 clientlog=$c/client/plan9.log

+ 4 - 4
dist/replica/plan9.db

@@ -843,7 +843,7 @@ dist - 20000000775 sys sys 1017437778 0
 dist/replica - 20000000775 sys sys 1019277119 0
 dist/replica/cd - 664 sys sys 1019527959 390
 dist/replica/kfs - 664 sys sys 1019527929 237
-dist/replica/network - 775 sys sys 1035481415 463
+dist/replica/network - 775 sys sys 1067910574 466
 dist/replica/plan9.proto - 664 sys sys 1022112985 1209
 env - 20000000775 sys sys 1015094872 0
 fd - 20000000775 sys sys 947958544 0
@@ -1243,7 +1243,7 @@ lib/face/48x48x2/x - 20000000755 sys sys 944941683 0
 lib/face/48x48x2/y - 20000000755 sys sys 944941683 0
 lib/face/48x48x2/z - 20000000755 sys sys 944941683 0
 lib/face/48x48x4 - 20000000775 sys sys 944941894 0
-lib/face/48x48x4/.dict - 664 sys sys 1060092065 2010
+lib/face/48x48x4/.dict - 664 sys sys 1067873122 2032
 lib/face/48x48x4/Z - 20000000775 sys sys 944945342 0
 lib/face/48x48x4/a - 20000000775 sys sys 944945701 0
 lib/face/48x48x4/a/adb.1 - 664 sys sys 944941890 962
@@ -5227,7 +5227,7 @@ sys/src/9/pc/devusb.c - 664 sys sys 1063857423 18352
 sys/src/9/pc/devvga.c - 664 sys sys 1063857412 8714
 sys/src/9/pc/dma.c - 664 sys sys 1015014515 4736
 sys/src/9/pc/ether2000.c - 664 sys sys 1017854323 2839
-sys/src/9/pc/ether2114x.c - 664 sys sys 1066618082 41227
+sys/src/9/pc/ether2114x.c - 664 sys sys 1067891102 41253
 sys/src/9/pc/ether589.c - 664 sys sys 1015014516 4644
 sys/src/9/pc/ether79c970.c - 664 sys sys 1018386992 14056
 sys/src/9/pc/ether8003.c - 664 sys sys 1015014516 6665
@@ -5350,7 +5350,7 @@ sys/src/9/port/devmouse.c - 664 sys sys 1067722758 12203
 sys/src/9/port/devnmouse.c - 664 sys sys 1036812999 3738
 sys/src/9/port/devpipe.c - 664 sys sys 1032640439 5825
 sys/src/9/port/devpnp.c - 664 sys sys 1055688361 13021
-sys/src/9/port/devproc.c - 664 sys sys 1067722717 28273
+sys/src/9/port/devproc.c - 664 sys sys 1067880146 28269
 sys/src/9/port/devrealtime.c - 664 sys sys 1055688366 16209
 sys/src/9/port/devroot.c - 664 sys sys 1067722764 4254
 sys/src/9/port/devsd.c - 664 sys sys 1055688396 28669

+ 4 - 0
dist/replica/plan9.log

@@ -14151,3 +14151,7 @@
 1067805086 5 c rc/bin/patch/undo - 775 sys sys 1067804405 549
 1067805086 6 a sys/man/1/patch - 664 sys sys 1067804449 2176
 1067810488 0 c sys/src/9/pc/mkfile - 664 sys sys 1067810339 3219
+1067873478 0 c lib/face/48x48x4/.dict - 664 sys sys 1067873122 2032
+1067880679 0 c sys/src/9/port/devproc.c - 664 sys sys 1067880146 28269
+1067891482 0 c sys/src/9/pc/ether2114x.c - 664 sys sys 1067891102 41253
+1067911286 0 c dist/replica/network - 775 sys sys 1067910574 466

+ 96 - 0
dist/replica/proto2

@@ -0,0 +1,96 @@
+# files like NOTICE
+*	- sys sys
+
+# adm owns adm
+adm	- adm adm
+	+	- adm adm
+
+# upas owns mail
+mail	- upas upas
+	box	- upas upas
+		glenda	- glenda glenda
+			+	- glenda glenda
+	faxoutqueue	- upas upas
+	faxqueue	- upas upas
+		+	- upas upas
+	fs	- upas upas
+	lib	- upas upas
+		+	- upas upas
+	queue	- upas upas
+	tmp	- upas upas
+
+# glenda owns her home directory
+usr	- sys sys
+	glenda	- glenda glenda
+		+	- glenda glenda
+
+# architectures owned by sys
+29000	- sys sys
+	+	- sys sys
+386	- sys sys
+	+	- sys sys
+68000	- sys sys
+	+	- sys sys
+68020	- sys sys
+	+	- sys sys
+960	- sys sys
+	+	- sys sys
+alpha	- sys sys
+	+	- sys sys
+arm	- sys sys
+	+	- sys sys
+mips	- sys sys
+	+	- sys sys
+power	- sys sys
+	+	- sys sys
+sparc	- sys sys
+	+	- sys sys
+
+# everything else is owned by sys
+acme	- sys sys
+	+	- sys sys
+cron	- sys sys
+	upas	- upas sys
+		+	- upas sys
+fd	- sys sys
+	+	- sys sys
+env	- sys sys
+	+	- sys sys
+lib	- sys sys
+	+	- sys sys
+lp	- sys sys
+	+	- sys sys
+mnt	- sys sys
+	+	- sys sys
+n	- sys sys
+	+	- sys sys
+rc	- sys sys
+	+	- sys sys
+sys	- sys sys
+	doc	- sys sys
+		+	- sys sys
+	games	- sys sys
+		+	- sys sys
+	include	- sys sys
+		+	- sys sys
+	lib	- sys sys
+		+	- sys sys
+	log	- sys sys
+		*	666 sys sys
+		httpd	- sys sys
+			*	666 sys sys
+	man	- sys sys
+		+	- sys sys
+	src	- sys sys
+		+	- sys sys
+tmp	- sys sys
+	+	- sys sys
+
+# distribution metadata
+dist	- sys sys
+	replica	- sys sys
+		kfs	- sys sys
+		cd	- sys sys
+		network	- sys sys
+		plan9.proto	- sys sys
+

+ 1 - 0
lib/face/48x48x4/.dict

@@ -84,5 +84,6 @@ research.att.com/andrew a/andrew.1
 research.att.com/llc l/llc.1
 research.att.com/rsc r/rsc.1
 research.att.com/rvc r/rvc.1
+swtch.com/rsc r/rsc.1
 ucalgary.ca/andrey a/andrey.1
 FACEDOM/glenda g/glenda.1

+ 1 - 0
sys/src/9/pc/ether2114x.c

@@ -1637,6 +1637,7 @@ dec2114xpci(void)
 
 		case Tulip0:			/* 21140 */
 		case Tulip1:			/* 21041 */
+		case Pnic:			/* PNIC */
 		case Pnic2:			/* PNIC-II */
 		case CentaurP:			/* ADMtek */
 			break;

+ 1 - 3
sys/src/9/port/devproc.c

@@ -224,15 +224,13 @@ procgen(Chan *c, char *name, Dirtab *tab, int, int s, Dir *dp)
 		devdir(c, qid, up->genbuf, 0, p->user, DMDIR|0555, dp);
 		return 1;
 	}
-
 	if(c->qid.path == Qtrace){
 		strcpy(up->genbuf, "trace");
 		mkqid(&qid, Qtrace, -1, QTFILE);
 		devdir(c, qid, up->genbuf, 0, eve, 0444, dp);
 		return 1;
 	}
-
-	if(--s >= nelem(procdir))
+	if(s >= nelem(procdir))
 		return -1;
 	if(tab)
 		panic("procgen");