Plan 9 from Bell Labs 2005-03-26

dist/replica/_plan9.db

@@ -3056,7 +3056,7 @@ rc/bin/patch/apply - 775 sys sys 1109511606 1285
 rc/bin/patch/create - 775 sys sys 1107957505 1404
 rc/bin/patch/diff - 775 sys sys 1109511606 474
 rc/bin/patch/email - 775 sys sys 1109511607 409
-rc/bin/patch/list - 775 sys sys 1110722754 716
+rc/bin/patch/list - 775 sys sys 1111765301 729
 rc/bin/patch/move - 775 sys sys 1109511607 573
 rc/bin/patch/note - 664 sys sys 1109511607 663
 rc/bin/patch/okay - 775 sys sys 1109511608 250
@@ -3610,10 +3610,10 @@ 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/configppp - 775 sys sys 1019058714 1402
 sys/lib/dist/pc/inst/copydist - 775 sys sys 1019917500 703
-sys/lib/dist/pc/inst/defs - 664 sys sys 1063856187 2728
+sys/lib/dist/pc/inst/defs - 664 sys sys 1111771991 2743
 sys/lib/dist/pc/inst/download - 775 sys sys 1063856193 1237
 sys/lib/dist/pc/inst/finish - 775 sys sys 1032990669 266
-sys/lib/dist/pc/inst/fmtfossil - 775 sys sys 1063856193 1990
+sys/lib/dist/pc/inst/fmtfossil - 775 sys sys 1111771991 1982
 sys/lib/dist/pc/inst/fmtventi - 775 sys sys 1063856189 3345
 sys/lib/dist/pc/inst/gui - 775 sys sys 1032539034 79
 sys/lib/dist/pc/inst/halt - 775 sys sys 1063856192 497
@@ -3627,16 +3627,16 @@ sys/lib/dist/pc/inst/iskfs - 775 sys sys 1018469719 183
 sys/lib/dist/pc/inst/isventi - 775 sys sys 1063856189 228
 sys/lib/dist/pc/inst/isventiarenas - 775 sys sys 1063856189 258
 sys/lib/dist/pc/inst/isventiisect - 775 sys sys 1063856190 256
-sys/lib/dist/pc/inst/main - 775 sys sys 1063856189 1952
+sys/lib/dist/pc/inst/main - 775 sys sys 1111771992 1941
 sys/lib/dist/pc/inst/mainloop - 775 sys sys 1019058715 532
 sys/lib/dist/pc/inst/mkini.awk - 664 sys sys 1019917495 1163
 sys/lib/dist/pc/inst/mountdist - 775 sys sys 1045504304 4889
 sys/lib/dist/pc/inst/mountfossil - 775 sys sys 1063856193 3556
-sys/lib/dist/pc/inst/mountfs - 775 sys sys 1063856188 217
+sys/lib/dist/pc/inst/mountfs - 775 sys sys 1111771992 182
 sys/lib/dist/pc/inst/mountkfs - 775 sys sys 1063856188 2481
 sys/lib/dist/pc/inst/moveoldfs - 775 sys sys 1089300756 1347
-sys/lib/dist/pc/inst/partdisk - 775 sys sys 1063856191 1828
-sys/lib/dist/pc/inst/prepdisk - 775 sys sys 1063856190 1604
+sys/lib/dist/pc/inst/partdisk - 775 sys sys 1111771992 1820
+sys/lib/dist/pc/inst/prepdisk - 775 sys sys 1111771992 1462
 sys/lib/dist/pc/inst/replcfg - 775 sys sys 1019533019 395
 sys/lib/dist/pc/inst/startether - 775 sys sys 1018640315 513
 sys/lib/dist/pc/inst/startppp - 775 sys sys 1019058715 577
@@ -5053,7 +5053,7 @@ sys/man/4/usbd - 664 sys sys 1018386778 731
 sys/man/4/vacfs - 664 sys sys 1084333062 1545
 sys/man/4/webcookies - 664 sys sys 1019828742 3525
 sys/man/4/webfs - 664 sys sys 1019828742 6455
-sys/man/4/wikifs - 664 sys sys 1018581459 7501
+sys/man/4/wikifs - 664 sys sys 1111765301 7505
 sys/man/5 - 20000000775 sys sys 1015024846 0
 sys/man/5/0intro - 664 sys sys 1072793193 14106
 sys/man/5/INDEX - 664 sys sys 1104736382 193
@@ -5450,6 +5450,7 @@ sys/src/9/pc/sdmylex.c - 664 sys sys 1071245460 27812
 sys/src/9/pc/sdscsi.c - 664 sys sys 1077033661 7487
 sys/src/9/pc/trap.c - 664 sys sys 1105109602 20537
 sys/src/9/pc/uarti8250.c - 664 sys sys 1102820421 13958
+sys/src/9/pc/uartisa.c - 664 sys sys 1111725178 1775
 sys/src/9/pc/uartpci.c - 664 sys sys 1096379063 2891
 sys/src/9/pc/usb.h - 664 sys sys 1099760881 3650
 sys/src/9/pc/usbuhci.c - 664 sys sys 1099760881 30955
@@ -7558,7 +7559,7 @@ sys/src/cmd/fax/receiverc - 775 sys sys 944960990 581
 sys/src/cmd/fax/send.c - 664 sys sys 944960990 923
 sys/src/cmd/fax/subr.c - 664 sys sys 1015090401 1245
 sys/src/cmd/fcp.c - 644 sys sys 1110816880 3780
-sys/src/cmd/file.c - 664 sys sys 1104849659 22939
+sys/src/cmd/file.c - 664 sys sys 1111784964 22934
 sys/src/cmd/fmt.c - 664 sys sys 1070032009 4088
 sys/src/cmd/fortune.c - 664 sys sys 1072729222 1779
 sys/src/cmd/fossil - 20000000775 sys sys 1042005512 0
@@ -12482,3 +12483,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
+386/bin/file - 775 sys sys 1111810171 112495

dist/replica/plan9.db

@@ -224,7 +224,7 @@
 386/bin/faces - 775 sys sys 1106799174 192579
 386/bin/factor - 775 sys sys 1104122008 61475
 386/bin/fcp - 775 sys sys 1110859785 82162
-386/bin/file - 775 sys sys 1108008333 112495
+386/bin/file - 775 sys sys 1111810171 112495
 386/bin/fmt - 775 sys sys 1104122009 65301
 386/bin/fortune - 775 sys sys 1104122009 67136
 386/bin/fossil - 20000000775 sys sys 1042005470 0
@@ -3056,7 +3056,7 @@ rc/bin/patch/apply - 775 sys sys 1109511606 1285
 rc/bin/patch/create - 775 sys sys 1107957505 1404
 rc/bin/patch/diff - 775 sys sys 1109511606 474
 rc/bin/patch/email - 775 sys sys 1109511607 409
-rc/bin/patch/list - 775 sys sys 1110722754 716
+rc/bin/patch/list - 775 sys sys 1111765301 729
 rc/bin/patch/move - 775 sys sys 1109511607 573
 rc/bin/patch/note - 664 sys sys 1109511607 663
 rc/bin/patch/okay - 775 sys sys 1109511608 250
@@ -3610,10 +3610,10 @@ 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/configppp - 775 sys sys 1019058714 1402
 sys/lib/dist/pc/inst/copydist - 775 sys sys 1019917500 703
-sys/lib/dist/pc/inst/defs - 664 sys sys 1063856187 2728
+sys/lib/dist/pc/inst/defs - 664 sys sys 1111771991 2743
 sys/lib/dist/pc/inst/download - 775 sys sys 1063856193 1237
 sys/lib/dist/pc/inst/finish - 775 sys sys 1032990669 266
-sys/lib/dist/pc/inst/fmtfossil - 775 sys sys 1063856193 1990
+sys/lib/dist/pc/inst/fmtfossil - 775 sys sys 1111771991 1982
 sys/lib/dist/pc/inst/fmtventi - 775 sys sys 1063856189 3345
 sys/lib/dist/pc/inst/gui - 775 sys sys 1032539034 79
 sys/lib/dist/pc/inst/halt - 775 sys sys 1063856192 497
@@ -3627,16 +3627,16 @@ sys/lib/dist/pc/inst/iskfs - 775 sys sys 1018469719 183
 sys/lib/dist/pc/inst/isventi - 775 sys sys 1063856189 228
 sys/lib/dist/pc/inst/isventiarenas - 775 sys sys 1063856189 258
 sys/lib/dist/pc/inst/isventiisect - 775 sys sys 1063856190 256
-sys/lib/dist/pc/inst/main - 775 sys sys 1063856189 1952
+sys/lib/dist/pc/inst/main - 775 sys sys 1111771992 1941
 sys/lib/dist/pc/inst/mainloop - 775 sys sys 1019058715 532
 sys/lib/dist/pc/inst/mkini.awk - 664 sys sys 1019917495 1163
 sys/lib/dist/pc/inst/mountdist - 775 sys sys 1045504304 4889
 sys/lib/dist/pc/inst/mountfossil - 775 sys sys 1063856193 3556
-sys/lib/dist/pc/inst/mountfs - 775 sys sys 1063856188 217
+sys/lib/dist/pc/inst/mountfs - 775 sys sys 1111771992 182
 sys/lib/dist/pc/inst/mountkfs - 775 sys sys 1063856188 2481
 sys/lib/dist/pc/inst/moveoldfs - 775 sys sys 1089300756 1347
-sys/lib/dist/pc/inst/partdisk - 775 sys sys 1063856191 1828
-sys/lib/dist/pc/inst/prepdisk - 775 sys sys 1063856190 1604
+sys/lib/dist/pc/inst/partdisk - 775 sys sys 1111771992 1820
+sys/lib/dist/pc/inst/prepdisk - 775 sys sys 1111771992 1462
 sys/lib/dist/pc/inst/replcfg - 775 sys sys 1019533019 395
 sys/lib/dist/pc/inst/startether - 775 sys sys 1018640315 513
 sys/lib/dist/pc/inst/startppp - 775 sys sys 1019058715 577
@@ -5053,7 +5053,7 @@ sys/man/4/usbd - 664 sys sys 1018386778 731
 sys/man/4/vacfs - 664 sys sys 1084333062 1545
 sys/man/4/webcookies - 664 sys sys 1019828742 3525
 sys/man/4/webfs - 664 sys sys 1019828742 6455
-sys/man/4/wikifs - 664 sys sys 1018581459 7501
+sys/man/4/wikifs - 664 sys sys 1111765301 7505
 sys/man/5 - 20000000775 sys sys 1015024846 0
 sys/man/5/0intro - 664 sys sys 1072793193 14106
 sys/man/5/INDEX - 664 sys sys 1104736382 193
@@ -5450,6 +5450,7 @@ sys/src/9/pc/sdmylex.c - 664 sys sys 1071245460 27812
 sys/src/9/pc/sdscsi.c - 664 sys sys 1077033661 7487
 sys/src/9/pc/trap.c - 664 sys sys 1105109602 20537
 sys/src/9/pc/uarti8250.c - 664 sys sys 1102820421 13958
+sys/src/9/pc/uartisa.c - 664 sys sys 1111725178 1775
 sys/src/9/pc/uartpci.c - 664 sys sys 1096379063 2891
 sys/src/9/pc/usb.h - 664 sys sys 1099760881 3650
 sys/src/9/pc/usbuhci.c - 664 sys sys 1099760881 30955
@@ -7558,7 +7559,7 @@ sys/src/cmd/fax/receiverc - 775 sys sys 944960990 581
 sys/src/cmd/fax/send.c - 664 sys sys 944960990 923
 sys/src/cmd/fax/subr.c - 664 sys sys 1015090401 1245
 sys/src/cmd/fcp.c - 644 sys sys 1110816880 3780
-sys/src/cmd/file.c - 664 sys sys 1104849659 22939
+sys/src/cmd/file.c - 664 sys sys 1111784964 22934
 sys/src/cmd/fmt.c - 664 sys sys 1070032009 4088
 sys/src/cmd/fortune.c - 664 sys sys 1072729222 1779
 sys/src/cmd/fossil - 20000000775 sys sys 1042005512 0

dist/replica/plan9.log

@@ -13983,3 +13983,14 @@
 1111608031 2 c sys/src/cmd/acme/ecmd.c - 664 sys sys 1111606460 24205
 1111608031 3 c sys/src/cmd/acme/elog.c - 664 sys sys 1111607796 7294
 1111638638 0 c 386/bin/acme - 775 sys sys 1111637282 428512
+1111726858 0 a sys/src/9/pc/uartisa.c - 664 sys sys 1111725178 1775
+1111766466 0 c rc/bin/patch/list - 775 sys sys 1111765301 729
+1111766466 1 c sys/man/4/wikifs - 664 sys sys 1111765301 7505
+1111773667 0 c sys/lib/dist/pc/inst/defs - 664 sys sys 1111771991 2743
+1111773667 1 c sys/lib/dist/pc/inst/fmtfossil - 775 sys sys 1111771991 1982
+1111773667 2 c sys/lib/dist/pc/inst/main - 775 sys sys 1111771992 1941
+1111773667 3 c sys/lib/dist/pc/inst/mountfs - 775 sys sys 1111771992 182
+1111773667 4 c sys/lib/dist/pc/inst/partdisk - 775 sys sys 1111771992 1820
+1111773667 5 c sys/lib/dist/pc/inst/prepdisk - 775 sys sys 1111771992 1462
+1111786270 0 c sys/src/cmd/file.c - 664 sys sys 1111784964 22934
+1111811481 0 c 386/bin/file - 775 sys sys 1111810171 112495

rc/bin/patch/list

@@ -32,8 +32,10 @@ for(i in $*){
 			echo from `{cat $i/email}
 		cat $i/files | awk '{print "	" $1}'
 		cat $i/readme | sed 's/^/	/' | $trunc
-		if(test -f $i/notes)
+		if(test -f $i/notes){
+			echo
 			cat $i/notes
+		}
 	}
 	if not
 		echo '	'bad patch: $status >[2=1]

sys/lib/dist/pc/inst/defs

@@ -175,3 +175,5 @@ fn runkfs {
 	disk/kfscmd -n$1 allow
 }
 
+fstype=fossil
+

sys/lib/dist/pc/inst/fmtfossil

@@ -1,7 +1,7 @@
 #!/bin/rc
 
 # desc: initialize disks for a fossil server
-# prereq: configfs
+# prereq: 
 
 switch($1){
 case checkready checkdone

sys/lib/dist/pc/inst/main

@@ -12,7 +12,6 @@ echo -n 'Preparing menu...'
 
 # must be topologically sorted (by prereq)
 tasks=(\
-	configfs\
 	partdisk prepdisk\
 	fmtventi\
 	fmtfossil\

sys/lib/dist/pc/inst/mountfs

@@ -1,11 +1,9 @@
 #!/bin/rc
 
 # desc: choose and mount file system partition
-# prereq: configfs
+# prereq: 
 
 switch($fstype){
-case kfs
-	exec mountkfs $*
 case fossil fossil+venti
 	exec mountfossil $*
 case *

sys/lib/dist/pc/inst/partdisk

@@ -1,7 +1,7 @@
 #!/bin/rc
 
 # desc: edit partition tables (e.g., to create a plan 9 partition)
-# prereq: configfs
+# prereq: 
 
 switch($1){
 case go

sys/lib/dist/pc/inst/prepdisk

@@ -4,8 +4,6 @@
 # prereq: partdisk
 
 fn autotype {
-	if(~ $fstype kfs)
-		echo -a 9fat -a nvram -a fs -a swap
 	if(~ $fstype fossil)
 		echo -a 9fat -a nvram -a fossil -a swap
 	if(~ $fstype fossil+venti)
@@ -49,9 +47,6 @@ case checkdone
 	if(! ~ $prepdisk ready){
 		prepdisk=done
 		switch($fstype){
-		case kfs
-			if(! test -f /dev/sd*/fs* && ! test -f /dev/fs/fs*)
-				prepdisk=ready
 		case fossil
 			if(! test -f /dev/sd*/fossil* && ! test -f /dev/fs/fossil*)
 				prepdisk=ready

sys/man/4/wikifs

@@ -118,6 +118,7 @@ takes the form
 This page's contents were submitted but rejected due to a
 conflicting write.
 .PD
+.PP
 After the metadata comes the actual page contents; each line of
 page contents is prefixed with a
 .B #

sys/src/cmd/file.c

@@ -1227,7 +1227,7 @@ iself(void)
 	[41]	"Alpha",
 	[43]	"sparc v9",
 	[50]	"IA-46",
-	[62]	"AMD x86-64",
+	[62]	"AMD64",
 	[75]	"VAX",
 	};