Plan 9 from Bell Labs 2007-02-19

dist/replica/_plan9.db

@@ -43,21 +43,21 @@
 386/bin/ascii - 775 sys sys 1168402265 64884
 386/bin/astro - 775 sys sys 1148500574 138871
 386/bin/auth - 20000000775 sys sys 1016920815 0
-386/bin/auth/aescbc - 775 sys sys 1171743872 141338
+386/bin/auth/aescbc - 775 sys sys 1171830297 141337
 386/bin/auth/asn12rsa - 775 sys sys 1168402266 120828
 386/bin/auth/authsrv - 775 sys sys 1169612018 166651
 386/bin/auth/changeuser - 775 sys sys 1168402267 97488
-386/bin/auth/convkeys - 775 sys sys 1171743872 88681
-386/bin/auth/convkeys2 - 775 sys sys 1171743873 88740
+386/bin/auth/convkeys - 775 sys sys 1171830297 88680
+386/bin/auth/convkeys2 - 775 sys sys 1171830297 88739
 386/bin/auth/cron - 775 sys sys 1168402268 144754
 386/bin/auth/debug - 775 sys sys 1168402268 101566
 386/bin/auth/disable - 775 sys sys 1020319057 146
 386/bin/auth/enable - 775 sys sys 1020319057 134
-386/bin/auth/factotum - 775 sys sys 1171743873 322645
+386/bin/auth/factotum - 775 sys sys 1171830298 322644
 386/bin/auth/fgui - 775 sys sys 1168402269 218990
 386/bin/auth/guard.srv - 775 sys sys 1169612018 143828
 386/bin/auth/iam - 775 sys sys 1085076981 50791
-386/bin/auth/keyfs - 775 sys sys 1171743874 116577
+386/bin/auth/keyfs - 775 sys sys 1171830298 116576
 386/bin/auth/login - 775 sys sys 1168402270 104747
 386/bin/auth/newns - 775 sys sys 1168402270 89966
 386/bin/auth/none - 775 sys sys 1168402270 89249
@@ -71,13 +71,13 @@
 386/bin/auth/rsafill - 775 sys sys 1168402273 143968
 386/bin/auth/rsagen - 775 sys sys 1168402273 153528
 386/bin/auth/secretpem - 775 sys sys 1045537944 118526
-386/bin/auth/secstore - 775 sys sys 1171743874 196464
+386/bin/auth/secstore - 775 sys sys 1171830299 196463
 386/bin/auth/secstored - 775 sys sys 1169612019 198002
 386/bin/auth/secuser - 775 sys sys 1168402275 153231
 386/bin/auth/status - 775 sys sys 1020319060 738
 386/bin/auth/uniq - 775 sys sys 1168402275 63314
 386/bin/auth/warning - 775 sys sys 1168402275 101295
-386/bin/auth/wrkey - 775 sys sys 1171743875 76275
+386/bin/auth/wrkey - 775 sys sys 1171830299 76274
 386/bin/aux - 20000000775 sys sys 1016920817 0
 386/bin/aux/8prefix - 775 sys sys 1168402276 67103
 386/bin/aux/9pcon - 775 sys sys 1168402276 95153
@@ -176,7 +176,7 @@
 386/bin/cat - 775 sys sys 1148500611 37482
 386/bin/cb - 775 sys sys 1168402293 77628
 386/bin/cdfs - 775 sys sys 1168402294 167435
-386/bin/cfs - 775 sys sys 1168402294 128271
+386/bin/cfs - 775 sys sys 1171830300 128247
 386/bin/chgrp - 775 sys sys 1168402294 59522
 386/bin/chmod - 775 sys sys 1168402294 62518
 386/bin/cifscmd - 775 sys sys 1169612022 343611
@@ -208,7 +208,7 @@
 386/bin/disk/exsort - 775 sys sys 1168402301 60455
 386/bin/disk/fdisk - 775 sys sys 1168402301 104096
 386/bin/disk/format - 775 sys sys 1168402302 89778
-386/bin/disk/kfs - 775 sys sys 1171743875 250081
+386/bin/disk/kfs - 775 sys sys 1171830300 250080
 386/bin/disk/kfscmd - 775 sys sys 1148500626 38257
 386/bin/disk/ksync - 775 sys sys 1020319074 302
 386/bin/disk/mbr - 775 sys sys 1168402302 73918
@@ -545,7 +545,7 @@
 386/lib/lib9p.a - 664 sys sys 1168402362 90956
 386/lib/libString.a - 664 sys sys 1168402362 22126
 386/lib/libauth.a - 664 sys sys 1171743876 58570
-386/lib/libauthsrv.a - 664 sys sys 1171743876 35834
+386/lib/libauthsrv.a - 664 sys sys 1171830301 35838
 386/lib/libbin.a - 664 sys sys 1168402363 2534
 386/lib/libbio.a - 664 sys sys 1168402363 25980
 386/lib/libc.a - 664 sys sys 1168402364 503128
@@ -9074,7 +9074,7 @@ sys/src/boot/pc/kfs.h - 664 sys sys 1032215924 861
 sys/src/boot/pc/kfsboot.c - 664 sys sys 1032215914 4788
 sys/src/boot/pc/l.s - 664 sys sys 1130887225 18115
 sys/src/boot/pc/lib.h - 664 sys sys 1135487939 2796
-sys/src/boot/pc/load.c - 664 sys sys 1135487939 8923
+sys/src/boot/pc/load.c - 664 sys sys 1171784377 9288
 sys/src/boot/pc/mbr.s - 664 sys sys 1015007953 6234
 sys/src/boot/pc/mem.h - 664 sys sys 1130887225 3371
 sys/src/boot/pc/memory.c - 664 sys sys 1019533021 10272
@@ -9094,7 +9094,7 @@ sys/src/boot/pc/sd.h - 664 sys sys 1153333456 2244
 sys/src/boot/pc/sd53c8xx.c - 664 sys sys 1144961191 52127
 sys/src/boot/pc/sd53c8xx.i - 664 sys sys 1015007955 27245
 sys/src/boot/pc/sdata.c - 664 sys sys 1161230053 38799
-sys/src/boot/pc/sdmylex.c - 664 sys sys 1144961191 28693
+sys/src/boot/pc/sdmylex.c - 664 sys sys 1171783051 28694
 sys/src/boot/pc/sdscsi.c - 664 sys sys 1144961224 7006
 sys/src/boot/pc/trap.c - 664 sys sys 1144961191 7499
 sys/src/boot/pc/ureg.h - 664 sys sys 1015007955 550
@@ -9881,7 +9881,7 @@ sys/src/cmd/cfs - 20000000775 sys sys 1045505024 0
 sys/src/cmd/cfs/bcache.c - 664 sys sys 1014925219 2956
 sys/src/cmd/cfs/bcache.h - 664 sys sys 1014925220 797
 sys/src/cmd/cfs/cformat.h - 664 sys sys 1014925220 1404
-sys/src/cmd/cfs/cfs.c - 664 sys sys 1134305455 16526
+sys/src/cmd/cfs/cfs.c - 664 sys sys 1171785255 16484
 sys/src/cmd/cfs/disk.c - 664 sys sys 1134305455 5949
 sys/src/cmd/cfs/disk.h - 664 sys sys 1014925220 467
 sys/src/cmd/cfs/file.c - 664 sys sys 944960876 5124
@@ -14642,7 +14642,7 @@ sys/src/libauthsrv/mkfile - 664 sys sys 1035389776 409
 sys/src/libauthsrv/nvcsum.c - 664 sys sys 1015091654 192
 sys/src/libauthsrv/opasstokey.c - 664 sys sys 1015091654 448
 sys/src/libauthsrv/passtokey.c - 664 sys sys 1143695654 488
-sys/src/libauthsrv/readnvram.c - 664 sys sys 1171690274 10057
+sys/src/libauthsrv/readnvram.c - 664 sys sys 1171777600 10170
 sys/src/libbin - 20000000775 sys sys 1045502972 0
 sys/src/libbin/bin.c - 664 sys sys 1135487932 1829
 sys/src/libbin/mkfile - 664 sys sys 1035389776 197

dist/replica/plan9.db

@@ -43,21 +43,21 @@
 386/bin/ascii - 775 sys sys 1168402265 64884
 386/bin/astro - 775 sys sys 1148500574 138871
 386/bin/auth - 20000000775 sys sys 1016920815 0
-386/bin/auth/aescbc - 775 sys sys 1171743872 141338
+386/bin/auth/aescbc - 775 sys sys 1171830297 141337
 386/bin/auth/asn12rsa - 775 sys sys 1168402266 120828
 386/bin/auth/authsrv - 775 sys sys 1169612018 166651
 386/bin/auth/changeuser - 775 sys sys 1168402267 97488
-386/bin/auth/convkeys - 775 sys sys 1171743872 88681
-386/bin/auth/convkeys2 - 775 sys sys 1171743873 88740
+386/bin/auth/convkeys - 775 sys sys 1171830297 88680
+386/bin/auth/convkeys2 - 775 sys sys 1171830297 88739
 386/bin/auth/cron - 775 sys sys 1168402268 144754
 386/bin/auth/debug - 775 sys sys 1168402268 101566
 386/bin/auth/disable - 775 sys sys 1020319057 146
 386/bin/auth/enable - 775 sys sys 1020319057 134
-386/bin/auth/factotum - 775 sys sys 1171743873 322645
+386/bin/auth/factotum - 775 sys sys 1171830298 322644
 386/bin/auth/fgui - 775 sys sys 1168402269 218990
 386/bin/auth/guard.srv - 775 sys sys 1169612018 143828
 386/bin/auth/iam - 775 sys sys 1085076981 50791
-386/bin/auth/keyfs - 775 sys sys 1171743874 116577
+386/bin/auth/keyfs - 775 sys sys 1171830298 116576
 386/bin/auth/login - 775 sys sys 1168402270 104747
 386/bin/auth/newns - 775 sys sys 1168402270 89966
 386/bin/auth/none - 775 sys sys 1168402270 89249
@@ -71,13 +71,13 @@
 386/bin/auth/rsafill - 775 sys sys 1168402273 143968
 386/bin/auth/rsagen - 775 sys sys 1168402273 153528
 386/bin/auth/secretpem - 775 sys sys 1045537944 118526
-386/bin/auth/secstore - 775 sys sys 1171743874 196464
+386/bin/auth/secstore - 775 sys sys 1171830299 196463
 386/bin/auth/secstored - 775 sys sys 1169612019 198002
 386/bin/auth/secuser - 775 sys sys 1168402275 153231
 386/bin/auth/status - 775 sys sys 1020319060 738
 386/bin/auth/uniq - 775 sys sys 1168402275 63314
 386/bin/auth/warning - 775 sys sys 1168402275 101295
-386/bin/auth/wrkey - 775 sys sys 1171743875 76275
+386/bin/auth/wrkey - 775 sys sys 1171830299 76274
 386/bin/aux - 20000000775 sys sys 1016920817 0
 386/bin/aux/8prefix - 775 sys sys 1168402276 67103
 386/bin/aux/9pcon - 775 sys sys 1168402276 95153
@@ -176,7 +176,7 @@
 386/bin/cat - 775 sys sys 1148500611 37482
 386/bin/cb - 775 sys sys 1168402293 77628
 386/bin/cdfs - 775 sys sys 1168402294 167435
-386/bin/cfs - 775 sys sys 1168402294 128271
+386/bin/cfs - 775 sys sys 1171830300 128247
 386/bin/chgrp - 775 sys sys 1168402294 59522
 386/bin/chmod - 775 sys sys 1168402294 62518
 386/bin/cifscmd - 775 sys sys 1169612022 343611
@@ -208,7 +208,7 @@
 386/bin/disk/exsort - 775 sys sys 1168402301 60455
 386/bin/disk/fdisk - 775 sys sys 1168402301 104096
 386/bin/disk/format - 775 sys sys 1168402302 89778
-386/bin/disk/kfs - 775 sys sys 1171743875 250081
+386/bin/disk/kfs - 775 sys sys 1171830300 250080
 386/bin/disk/kfscmd - 775 sys sys 1148500626 38257
 386/bin/disk/ksync - 775 sys sys 1020319074 302
 386/bin/disk/mbr - 775 sys sys 1168402302 73918
@@ -545,7 +545,7 @@
 386/lib/lib9p.a - 664 sys sys 1168402362 90956
 386/lib/libString.a - 664 sys sys 1168402362 22126
 386/lib/libauth.a - 664 sys sys 1171743876 58570
-386/lib/libauthsrv.a - 664 sys sys 1171743876 35834
+386/lib/libauthsrv.a - 664 sys sys 1171830301 35838
 386/lib/libbin.a - 664 sys sys 1168402363 2534
 386/lib/libbio.a - 664 sys sys 1168402363 25980
 386/lib/libc.a - 664 sys sys 1168402364 503128
@@ -9074,7 +9074,7 @@ sys/src/boot/pc/kfs.h - 664 sys sys 1032215924 861
 sys/src/boot/pc/kfsboot.c - 664 sys sys 1032215914 4788
 sys/src/boot/pc/l.s - 664 sys sys 1130887225 18115
 sys/src/boot/pc/lib.h - 664 sys sys 1135487939 2796
-sys/src/boot/pc/load.c - 664 sys sys 1135487939 8923
+sys/src/boot/pc/load.c - 664 sys sys 1171784377 9288
 sys/src/boot/pc/mbr.s - 664 sys sys 1015007953 6234
 sys/src/boot/pc/mem.h - 664 sys sys 1130887225 3371
 sys/src/boot/pc/memory.c - 664 sys sys 1019533021 10272
@@ -9094,7 +9094,7 @@ sys/src/boot/pc/sd.h - 664 sys sys 1153333456 2244
 sys/src/boot/pc/sd53c8xx.c - 664 sys sys 1144961191 52127
 sys/src/boot/pc/sd53c8xx.i - 664 sys sys 1015007955 27245
 sys/src/boot/pc/sdata.c - 664 sys sys 1161230053 38799
-sys/src/boot/pc/sdmylex.c - 664 sys sys 1144961191 28693
+sys/src/boot/pc/sdmylex.c - 664 sys sys 1171783051 28694
 sys/src/boot/pc/sdscsi.c - 664 sys sys 1144961224 7006
 sys/src/boot/pc/trap.c - 664 sys sys 1144961191 7499
 sys/src/boot/pc/ureg.h - 664 sys sys 1015007955 550
@@ -9881,7 +9881,7 @@ sys/src/cmd/cfs - 20000000775 sys sys 1045505024 0
 sys/src/cmd/cfs/bcache.c - 664 sys sys 1014925219 2956
 sys/src/cmd/cfs/bcache.h - 664 sys sys 1014925220 797
 sys/src/cmd/cfs/cformat.h - 664 sys sys 1014925220 1404
-sys/src/cmd/cfs/cfs.c - 664 sys sys 1134305455 16526
+sys/src/cmd/cfs/cfs.c - 664 sys sys 1171785255 16484
 sys/src/cmd/cfs/disk.c - 664 sys sys 1134305455 5949
 sys/src/cmd/cfs/disk.h - 664 sys sys 1014925220 467
 sys/src/cmd/cfs/file.c - 664 sys sys 944960876 5124
@@ -14642,7 +14642,7 @@ sys/src/libauthsrv/mkfile - 664 sys sys 1035389776 409
 sys/src/libauthsrv/nvcsum.c - 664 sys sys 1015091654 192
 sys/src/libauthsrv/opasstokey.c - 664 sys sys 1015091654 448
 sys/src/libauthsrv/passtokey.c - 664 sys sys 1143695654 488
-sys/src/libauthsrv/readnvram.c - 664 sys sys 1171690274 10057
+sys/src/libauthsrv/readnvram.c - 664 sys sys 1171777600 10170
 sys/src/libbin - 20000000775 sys sys 1045502972 0
 sys/src/libbin/bin.c - 664 sys sys 1135487932 1829
 sys/src/libbin/mkfile - 664 sys sys 1035389776 197

dist/replica/plan9.log

@@ -47500,3 +47500,17 @@
 1171762206 2 c sys/src/9/bitsy/power.c - 664 sys sys 1171761416 7376
 1171762206 3 c sys/src/9/bitsy/sdata.c - 664 sys sys 1171761416 44377
 1171762206 4 c sys/src/9/bitsy/wavelan.c - 664 sys sys 1171761416 27148
+1171778406 0 c sys/src/libauthsrv/readnvram.c - 664 sys sys 1171777600 10170
+1171783806 0 c sys/src/boot/pc/sdmylex.c - 664 sys sys 1171783051 28694
+1171785607 0 c sys/src/boot/pc/load.c - 664 sys sys 1171784377 9288
+1171785607 1 c sys/src/cmd/cfs/cfs.c - 664 sys sys 1171785255 16484
+1171830606 0 c 386/bin/cfs - 775 sys sys 1171830300 128247
+1171830606 1 c 386/bin/auth/aescbc - 775 sys sys 1171830297 141337
+1171830606 2 c 386/bin/auth/convkeys - 775 sys sys 1171830297 88680
+1171830606 3 c 386/bin/auth/convkeys2 - 775 sys sys 1171830297 88739
+1171830606 4 c 386/bin/auth/factotum - 775 sys sys 1171830298 322644
+1171830606 5 c 386/bin/auth/keyfs - 775 sys sys 1171830298 116576
+1171830606 6 c 386/bin/auth/secstore - 775 sys sys 1171830299 196463
+1171830606 7 c 386/bin/auth/wrkey - 775 sys sys 1171830299 76274
+1171830606 8 c 386/bin/disk/kfs - 775 sys sys 1171830300 250080
+1171830606 9 c 386/lib/libauthsrv.a - 664 sys sys 1171830301 35838

sys/src/boot/pc/load.c

@@ -7,7 +7,16 @@
 
 #include "fs.h"
 
-static char *diskparts[] = { "dos", "9fat", "fs", "data", "cdboot", 0 };
+/*
+ * "cache" must be in this list so that 9load will pass the definition of
+ * the cache partition into the kernel so that the disk named by the `cfs'
+ * variable in plan9.ini can be seen in all circumstances before termrc
+ * sets up all the disk partitions.  In particular, if it's on an odd-ball
+ * disk like sd10 rather than sdC0, this is needed.
+ */
+static char *diskparts[] = {
+	"dos", "9fat", "fs", "data", "cdboot", "cache", 0
+};
 static char *etherparts[] = { "*", 0 };
 
 static char *diskinis[] = {

sys/src/boot/pc/sdmylex.c

@@ -899,7 +899,7 @@ buggery:
 	 * PCI and VLB buses.
 	 */
 	cmd[0] = Ciesi;
-	cmd[1] = 4;
+	cmd[1] = 14;
 	clen = 2;
 	dlen = 256;
 	if(issue(ctlr, cmd, clen, data, dlen)){

sys/src/cmd/cfs/cfs.c

@@ -136,14 +136,12 @@ main(int argc, char *argv[])
 	std = 0;
 	format = 0;
 	part = "/dev/sdC0/cache";
-	server = "il!emelie";
+	server = "tcp!edith";
 	mtpt = "/tmp";
 
 	ARGBEGIN{
 	case 'a':
-		server = ARGF();
-		if(server == 0)
-			usage();
+		server = EARGF(usage());
 		break;
 	case 'S':
 		statson = 1;
@@ -155,9 +153,7 @@ main(int argc, char *argv[])
 		format = 1;
 		break;
 	case 'f':
-		part = ARGF();
-		if(part == 0)
-			usage();
+		part = EARGF(usage());
 		break;
 	case 'd':
 		debug = 1;

sys/src/libauthsrv/readnvram.c

@@ -208,6 +208,7 @@ readnvram(Nvrsafe *safep, int flag)
 	Nvrwhere loc;
 
 	err = 0;
+	safe = (Nvrsafe*)buf;
 	memset(&loc, 0, sizeof loc);
 	findnvram(&loc);
 	if (loc.safelen < 0)
@@ -218,10 +219,13 @@ readnvram(Nvrsafe *safep, int flag)
 		fprint(2, "readnvram: couldn't find nvram\n");
 		if(!(flag&NVwritemem))
 			memset(safep, 0, sizeof(*safep));
-		return -1;
+		safe = safep;
+		/*
+		 * allow user to type the data for authentication,
+		 * even if there's no nvram to store it in.
+		 */
 	}
 
-	safe = (Nvrsafe*)buf;
 	if(flag&NVwritemem)
 		safe = safep;
 	else {