Plan 9 from Bell Labs 2005-05-21

dist/replica/_plan9.db

@@ -5995,22 +5995,22 @@ sys/lib/dist/pc/glenda/tmp - 20000000775 sys sys 1018469723 0
 sys/lib/dist/pc/inst - 20000000775 sys sys 1018721419 0
 sys/lib/dist/pc/inst/bootfloppy - 775 sys sys 1112361036 903
 sys/lib/dist/pc/inst/bootplan9 - 775 sys sys 1113252317 1574
-sys/lib/dist/pc/inst/bootsetup - 775 sys sys 1112361037 3688
+sys/lib/dist/pc/inst/bootsetup - 775 sys sys 1116595009 3542
 sys/lib/dist/pc/inst/bootwin9x - 775 sys sys 1112361037 2527
 sys/lib/dist/pc/inst/bootwinnt - 775 sys sys 1019240165 1041
 sys/lib/dist/pc/inst/configarch - 775 sys sys 1018640312 636
 sys/lib/dist/pc/inst/configdist - 775 sys sys 1019322595 400
 sys/lib/dist/pc/inst/configether - 775 sys sys 1019240165 1238
-sys/lib/dist/pc/inst/configfs - 775 sys sys 1112361037 568
+sys/lib/dist/pc/inst/configfs - 775 sys sys 1116594995 427
 sys/lib/dist/pc/inst/configip - 775 sys sys 1018469719 1132
-sys/lib/dist/pc/inst/confignet - 775 sys sys 1019322596 1301
+sys/lib/dist/pc/inst/confignet - 775 sys sys 1116594996 1294
 sys/lib/dist/pc/inst/configppp - 775 sys sys 1019058714 1402
 sys/lib/dist/pc/inst/copydist - 775 sys sys 1112361037 713
 sys/lib/dist/pc/inst/defs - 664 sys sys 1112361037 2439
 sys/lib/dist/pc/inst/download - 775 sys sys 1112361038 1217
 sys/lib/dist/pc/inst/finish - 775 sys sys 1032990669 266
 sys/lib/dist/pc/inst/fmtfossil - 775 sys sys 1112361038 1981
-sys/lib/dist/pc/inst/fmtventi - 775 sys sys 1112361038 3733
+sys/lib/dist/pc/inst/fmtventi - 775 sys sys 1116594986 3733
 sys/lib/dist/pc/inst/gui - 775 sys sys 1032539034 79
 sys/lib/dist/pc/inst/halt - 775 sys sys 1116424549 325
 sys/lib/dist/pc/inst/hasmbr - 775 sys sys 1018469719 171
@@ -7423,7 +7423,7 @@ sys/man/4/fs - 664 sys sys 1019058716 3387
 sys/man/4/ftpfs - 664 sys sys 1112563349 4410
 sys/man/4/import - 664 sys sys 1115314601 3095
 sys/man/4/iostats - 664 sys sys 1105574383 1621
-sys/man/4/keyfs - 664 sys sys 1017251244 5003
+sys/man/4/keyfs - 664 sys sys 1116594919 5048
 sys/man/4/kfs - 664 sys sys 1102088374 2164
 sys/man/4/lnfs - 664 sys sys 1073491345 1219
 sys/man/4/mntgen - 664 sys sys 1043680799 473
@@ -9485,7 +9485,7 @@ sys/src/cmd/aux/mnihongo/mnihongo.c - 664 sys sys 946759402 6406
 sys/src/cmd/aux/mnihongo/tmac.nihongo - 664 sys sys 944960789 22
 sys/src/cmd/aux/mouse.c - 664 sys sys 1063855425 7049
 sys/src/cmd/aux/ms2.c - 664 sys sys 1015008685 3129
-sys/src/cmd/aux/msexceltables.c - 664 sys sys 1116513714 13568
+sys/src/cmd/aux/msexceltables.c - 664 sys sys 1116594581 13722
 sys/src/cmd/aux/mswordstrings.c - 664 sys sys 952201344 5767
 sys/src/cmd/aux/na - 20000000775 sys sys 955036627 0
 sys/src/cmd/aux/na/mkfile - 664 sys sys 955036627 121
@@ -9806,7 +9806,7 @@ sys/src/cmd/disk/9660/unix.c - 664 sys sys 984788373 1352
 sys/src/cmd/disk/9660/util.c - 664 sys sys 1017679315 1294
 sys/src/cmd/disk/9660/write.c - 664 sys sys 1077376396 8836
 sys/src/cmd/disk/exsort.c - 664 sys sys 944960885 1964
-sys/src/cmd/disk/format.c - 664 sys sys 1022448818 17648
+sys/src/cmd/disk/format.c - 664 sys sys 1116595013 17648
 sys/src/cmd/disk/kfs - 20000000775 sys sys 1019072794 0
 sys/src/cmd/disk/kfs/9p1.c - 664 sys sys 1065916867 25359
 sys/src/cmd/disk/kfs/9p1.h - 664 sys sys 1091904426 2220
@@ -14884,4 +14884,4 @@ usr/glenda/lib/profile - 664 glenda glenda 1105128663 890
 usr/glenda/readme.acme - 664 glenda glenda 1019860628 4753
 usr/glenda/readme.rio - 664 glenda glenda 1019860628 6370
 usr/glenda/tmp - 20000000775 glenda glenda 1018802620 0
-sys/src/cmd/aux/msexceltables.c - 664 sys sys 1116559800 13722
+386/bin/aux/msexceltables - 775 sys sys 1116644791 81249

dist/replica/plan9.db

@@ -118,7 +118,7 @@
 386/bin/aux/mnihongo - 775 sys sys 1115950044 139321
 386/bin/aux/mouse - 775 sys sys 1115950044 44026
 386/bin/aux/ms2 - 775 sys sys 1115950044 84166
-386/bin/aux/msexceltables - 775 sys sys 1116557402 81233
+386/bin/aux/msexceltables - 775 sys sys 1116644791 81249
 386/bin/aux/mswordstrings - 775 sys sys 1115950044 65317
 386/bin/aux/na - 775 sys sys 1115950045 154186
 386/bin/aux/nfsmount - 775 sys sys 1115950045 234092
@@ -5995,22 +5995,22 @@ sys/lib/dist/pc/glenda/tmp - 20000000775 sys sys 1018469723 0
 sys/lib/dist/pc/inst - 20000000775 sys sys 1018721419 0
 sys/lib/dist/pc/inst/bootfloppy - 775 sys sys 1112361036 903
 sys/lib/dist/pc/inst/bootplan9 - 775 sys sys 1113252317 1574
-sys/lib/dist/pc/inst/bootsetup - 775 sys sys 1112361037 3688
+sys/lib/dist/pc/inst/bootsetup - 775 sys sys 1116595009 3542
 sys/lib/dist/pc/inst/bootwin9x - 775 sys sys 1112361037 2527
 sys/lib/dist/pc/inst/bootwinnt - 775 sys sys 1019240165 1041
 sys/lib/dist/pc/inst/configarch - 775 sys sys 1018640312 636
 sys/lib/dist/pc/inst/configdist - 775 sys sys 1019322595 400
 sys/lib/dist/pc/inst/configether - 775 sys sys 1019240165 1238
-sys/lib/dist/pc/inst/configfs - 775 sys sys 1112361037 568
+sys/lib/dist/pc/inst/configfs - 775 sys sys 1116594995 427
 sys/lib/dist/pc/inst/configip - 775 sys sys 1018469719 1132
-sys/lib/dist/pc/inst/confignet - 775 sys sys 1019322596 1301
+sys/lib/dist/pc/inst/confignet - 775 sys sys 1116594996 1294
 sys/lib/dist/pc/inst/configppp - 775 sys sys 1019058714 1402
 sys/lib/dist/pc/inst/copydist - 775 sys sys 1112361037 713
 sys/lib/dist/pc/inst/defs - 664 sys sys 1112361037 2439
 sys/lib/dist/pc/inst/download - 775 sys sys 1112361038 1217
 sys/lib/dist/pc/inst/finish - 775 sys sys 1032990669 266
 sys/lib/dist/pc/inst/fmtfossil - 775 sys sys 1112361038 1981
-sys/lib/dist/pc/inst/fmtventi - 775 sys sys 1112361038 3733
+sys/lib/dist/pc/inst/fmtventi - 775 sys sys 1116594986 3733
 sys/lib/dist/pc/inst/gui - 775 sys sys 1032539034 79
 sys/lib/dist/pc/inst/halt - 775 sys sys 1116424549 325
 sys/lib/dist/pc/inst/hasmbr - 775 sys sys 1018469719 171
@@ -7423,7 +7423,7 @@ sys/man/4/fs - 664 sys sys 1019058716 3387
 sys/man/4/ftpfs - 664 sys sys 1112563349 4410
 sys/man/4/import - 664 sys sys 1115314601 3095
 sys/man/4/iostats - 664 sys sys 1105574383 1621
-sys/man/4/keyfs - 664 sys sys 1017251244 5003
+sys/man/4/keyfs - 664 sys sys 1116594919 5048
 sys/man/4/kfs - 664 sys sys 1102088374 2164
 sys/man/4/lnfs - 664 sys sys 1073491345 1219
 sys/man/4/mntgen - 664 sys sys 1043680799 473
@@ -9485,7 +9485,7 @@ sys/src/cmd/aux/mnihongo/mnihongo.c - 664 sys sys 946759402 6406
 sys/src/cmd/aux/mnihongo/tmac.nihongo - 664 sys sys 944960789 22
 sys/src/cmd/aux/mouse.c - 664 sys sys 1063855425 7049
 sys/src/cmd/aux/ms2.c - 664 sys sys 1015008685 3129
-sys/src/cmd/aux/msexceltables.c - 664 sys sys 1116559800 13722
+sys/src/cmd/aux/msexceltables.c - 664 sys sys 1116594581 13722
 sys/src/cmd/aux/mswordstrings.c - 664 sys sys 952201344 5767
 sys/src/cmd/aux/na - 20000000775 sys sys 955036627 0
 sys/src/cmd/aux/na/mkfile - 664 sys sys 955036627 121
@@ -9806,7 +9806,7 @@ sys/src/cmd/disk/9660/unix.c - 664 sys sys 984788373 1352
 sys/src/cmd/disk/9660/util.c - 664 sys sys 1017679315 1294
 sys/src/cmd/disk/9660/write.c - 664 sys sys 1077376396 8836
 sys/src/cmd/disk/exsort.c - 664 sys sys 944960885 1964
-sys/src/cmd/disk/format.c - 664 sys sys 1022448818 17648
+sys/src/cmd/disk/format.c - 664 sys sys 1116595013 17648
 sys/src/cmd/disk/kfs - 20000000775 sys sys 1019072794 0
 sys/src/cmd/disk/kfs/9p1.c - 664 sys sys 1065916867 25359
 sys/src/cmd/disk/kfs/9p1.h - 664 sys sys 1091904426 2220

dist/replica/plan9.log

@@ -19179,3 +19179,11 @@
 1116514858 1 c sys/src/cmd/aux/msexceltables.c - 664 sys sys 1116513714 13568
 1116558007 0 c 386/bin/aux/msexceltables - 775 sys sys 1116557402 81233
 1116559806 0 c sys/src/cmd/aux/msexceltables.c - 664 sys sys 1116559800 13722
+1116595814 0 c sys/lib/dist/pc/inst/bootsetup - 775 sys sys 1116595009 3542
+1116595814 1 c sys/lib/dist/pc/inst/configfs - 775 sys sys 1116594995 427
+1116595814 2 c sys/lib/dist/pc/inst/confignet - 775 sys sys 1116594996 1294
+1116595814 3 c sys/lib/dist/pc/inst/fmtventi - 775 sys sys 1116594986 3733
+1116595814 4 c sys/man/4/keyfs - 664 sys sys 1116594919 5048
+1116595814 5 c sys/src/cmd/aux/msexceltables.c - 664 sys sys 1116594581 13722
+1116595814 6 c sys/src/cmd/disk/format.c - 664 sys sys 1116595013 17648
+1116646225 0 c 386/bin/aux/msexceltables - 775 sys sys 1116644791 81249

sys/lib/dist/pc/inst/bootsetup

@@ -91,15 +91,12 @@ case go
 	echo
 	echo 'There are myriad ways to boot a Plan 9 system.'
 	echo 'You can use any of the following.'
-	echo '(You can also repeat this task to use more than one).'
 	echo
 	echo '  floppy - create a boot floppy'
 	echo '  plan9  - make the plan 9 disk partition the default for booting'
 	echo '  win9x  - add a plan 9 option to windows 9x boot menu'
 	echo '  winnt  - add a plan 9 option to windows nt/2000/xp boot manager'
 	echo
-	echo '(See the documentation for instructions on booting Plan 9 from LILO.)'
-	echo
 	echo 'If you are upgrading an extant third edition installation and booting'
 	echo 'from something other than a floppy, you needn''t run anything here.'
 	echo 'Just type ctl-d.'

sys/lib/dist/pc/inst/configfs

@@ -15,9 +15,6 @@ case go
 	echo '	fossil			the new Plan9 fileserver'
 	echo '	fossil+venti	fossil + a archival dump server'
 	echo
-	echo '(fossil+venti only reserves and formats the partitions'
-	echo ' venti will need, but it will be started on the first'
-	echo ' boot.)'
 	prompt -d fossil 'File system' fossil fossil+venti
 	fstype=$rd
 	export fstype

sys/lib/dist/pc/inst/confignet

@@ -1,7 +1,7 @@
 #!/bin/rc
 
 # prereq: configdist
-# desc: configure the network to use to download the distribution
+# desc: configure the network to download the distribution
 
 switch($1){
 case checkready checkdone

sys/lib/dist/pc/inst/fmtventi

@@ -55,7 +55,7 @@ case go
 	if(! ~ $#ventiarena 0){
 		default=(-d $"ventiarena)
 	}
-	echo You have the following Venti index partitions.
+	echo You have the following Venti arena partitions.
 	ls -l $ff
 	echo
 
@@ -91,7 +91,7 @@ case go
 	ls -l $gg
 	echo
 
-	prompt $default 'Venti arena partitions to use'
+	prompt $default 'Venti index partitions to use'
 	aa=`{echo $rd}
 	bad=no
 	for(a in $aa){

sys/man/4/keyfs

@@ -140,19 +140,20 @@ Writing the string
 increments this number; writing
 .B good
 resets it to 0.
-If the number reaches fifty,
-.I keyfs
-disables the account.
-Once the account is disabled,
-the only way to enable it is to write the string
-.B ok
-to
-.BR status .
 This number is not stored in
 .IR keyfile ,
 and is initialized to 0 when
 .I keyfs
 starts.
+When the number reaches a multiple of ten,
+.I keyfs
+temporarily disables the account for that many seconds.
+Reads from the
+.B key
+or
+.B secret
+files during this time return the error
+``user in purgatory.''
 .TP
 .B status
 The current status of the account, either

sys/src/cmd/aux/msexceltables.c

@@ -628,9 +628,9 @@ colinfo(Biff *b)
 	int w  = gint(b, 2);
 
 	if (c1 < 0)
-		sysfatal("negitive collum number (%d)\n", c1);
+		sysfatal("negative column number (%d)\n", c1);
 	if (c2 >= Nwidths)
-		sysfatal("too many collums (%d > %d)\n", c2, Nwidths);
+		sysfatal("too many columns (%d > %d)\n", c2, Nwidths);
 	w /= 256;
 
 	if (w > 100)

sys/src/cmd/disk/format.c

@@ -481,7 +481,7 @@ dosfs(int dofat, int dopbs, Disk *disk, char *label, int argc, char *argv[], int
 	 */
 	if(dofat) {
 		if(commit) {
-			print("Initialising FAT file system\n");
+			print("Initializing FAT file system\n");
 			print("type %s, %d tracks, %d heads, %d sectors/track, %lld bytes/sec\n",
 				t->name, t->tracks, t->heads, t->sectors, secsize);
 		}