Browse Source

Plan 9 from Bell Labs 2005-04-02

David du Colombier 16 years ago
parent
commit
d6630d6a73

+ 18 - 3
acme/wiki/wiki.diff

@@ -4,9 +4,24 @@ rfork n
 cd $1
 *=(`{ls -drp [0-9]*})
 
-diff -n index.txt $1/index.txt | sed 's/^(.*)index.txt:(.*)index.txt:/\1current:\2:/g'
 while(! ~ $#* 0 1){
-	diff -n $1/index.txt $2/index.txt | sed 's/^(.*)index.txt:(.*)index.txt:/\1:\2:/g'
+	diff -n $2/index.txt $1/index.txt | awk  -F'[\/ :]' '
+	$1 ~/^[0-9]+$/ {  
+		getA = "cat "$1"/current | sed -n -e ''1d; /^A/s/^A//p; /^#/q''"
+		getA | getline A; close getA
+		$1 = t2d($1)
+		$5 = t2d($5)
+		print "\n" A ":\n" $1":"$3" "$4" "$5":"$7
+		next
+	} 
+	{ print }
+
+	function t2d(t) {
+		c = "date "t; c|getline l; close c
+		split(l, a, "[ :]+")
+		return  a[1]" "a[2]" "a[3]" "a[4]":"a[5]" "a[8]"("t")"
+	}'
 	shift
-}
+}  
+
 echo clean >/dev/ctl >[2]/dev/null

+ 37 - 36
dist/replica/_plan9.db

@@ -688,7 +688,7 @@ acme/bin/unind - 755 sys sys 1015011256 27
 acme/bin/wnew - 775 sys sys 1046184422 84
 acme/mail - 20000000775 sys sys 1015011265 0
 acme/mail/386 - 20000000775 sys sys 1015011538 0
-acme/mail/386/Mail - 775 sys sys 1112270166 179119
+acme/mail/386/Mail - 775 sys sys 1112328581 179119
 acme/mail/Mail - 775 sys sys 1015011264 202
 acme/mail/alpha - 20000000775 sys sys 1015011521 0
 acme/mail/arm - 20000000775 sys sys 1015011525 0
@@ -725,7 +725,7 @@ acme/wiki/src/mkfile - 664 sys sys 1015011266 138
 acme/wiki/src/util.c - 664 sys sys 1016901956 1176
 acme/wiki/src/wiki.c - 664 sys sys 1109869230 10727
 acme/wiki/src/win.c - 664 sys sys 1016901957 5106
-acme/wiki/wiki.diff - 775 sys sys 1015011266 283
+acme/wiki/wiki.diff - 775 sys sys 1112362985 525
 adm - 20000000775 adm adm 1017438729 0
 adm/cache - 664 adm adm 1020313578 0
 adm/keys - 660 adm adm 1020313578 0
@@ -870,7 +870,7 @@ 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 1071079179 996
-dist/replica/plan9.proto - 664 sys sys 1104813012 2497
+dist/replica/plan9.proto - 664 sys sys 1112361655 2500
 env - 20000000775 sys sys 1015094872 0
 fd - 20000000775 sys sys 947958544 0
 lib - 20000000775 sys sys 958504315 0
@@ -2823,7 +2823,7 @@ lp/prob - 20000000777 sys sys 958199268 0
 lp/queue - 20000000777 sys sys 958199268 0
 lp/tmp - 20000000777 sys sys 958199268 0
 mail - 20000000775 upas upas 953344765 0
-mail/box - 20000000775 upas upas 1018729988 0
+mail/box - 20000000777 upas upas 1039727907 0
 mail/box/glenda - 20000000775 glenda glenda 1019530541 0
 mail/box/glenda/L.mbox - 4000000666 glenda glenda 1018730020 0
 mail/box/glenda/mbox - 10000000662 glenda glenda 1019530558 10699
@@ -3597,24 +3597,24 @@ sys/lib/dist/pc/glenda/lib/first.window - 775 sys sys 1018469723 143
 sys/lib/dist/pc/glenda/lib/profile - 664 sys sys 1032883600 327
 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 1019240165 899
+sys/lib/dist/pc/inst/bootfloppy - 775 sys sys 1112361036 903
 sys/lib/dist/pc/inst/bootplan9 - 775 sys sys 1019534696 1584
-sys/lib/dist/pc/inst/bootsetup - 775 sys sys 1107839820 3572
-sys/lib/dist/pc/inst/bootwin9x - 775 sys sys 1020384273 2525
+sys/lib/dist/pc/inst/bootsetup - 775 sys sys 1112361037 3688
+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 1063856192 538
+sys/lib/dist/pc/inst/configfs - 775 sys sys 1112361037 568
 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 1111771991 2743
-sys/lib/dist/pc/inst/download - 775 sys sys 1063856193 1237
+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 1111771991 1982
-sys/lib/dist/pc/inst/fmtventi - 775 sys sys 1063856189 3345
+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/gui - 775 sys sys 1032539034 79
 sys/lib/dist/pc/inst/halt - 775 sys sys 1063856192 497
 sys/lib/dist/pc/inst/hasmbr - 775 sys sys 1018469719 171
@@ -3624,35 +3624,35 @@ sys/lib/dist/pc/inst/isext2 - 775 sys sys 1018469719 204
 sys/lib/dist/pc/inst/isfat - 775 sys sys 1018469719 457
 sys/lib/dist/pc/inst/isfossil - 775 sys sys 1063856189 385
 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 1111771992 1941
+sys/lib/dist/pc/inst/isventi - 775 sys sys 1112361038 227
+sys/lib/dist/pc/inst/isventiarenas - 775 sys sys 1112361038 258
+sys/lib/dist/pc/inst/isventiisect - 775 sys sys 1112361038 256
+sys/lib/dist/pc/inst/main - 775 sys sys 1112361039 1952
 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 1111771992 182
+sys/lib/dist/pc/inst/mountdist - 775 sys sys 1112360993 5129
+sys/lib/dist/pc/inst/mountfossil - 775 sys sys 1112361039 2511
+sys/lib/dist/pc/inst/mountfs - 775 sys sys 1112361039 190
 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 1111771992 1820
+sys/lib/dist/pc/inst/partdisk - 775 sys sys 1112361039 1828
 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/replcfg - 775 sys sys 1112361039 399
 sys/lib/dist/pc/inst/startether - 775 sys sys 1018640315 513
 sys/lib/dist/pc/inst/startppp - 775 sys sys 1019058715 577
 sys/lib/dist/pc/inst/startwin - 775 sys sys 1018469719 776
 sys/lib/dist/pc/inst/stop - 775 sys sys 1033073371 1148
 sys/lib/dist/pc/inst/stopether - 775 sys sys 1018469719 269
 sys/lib/dist/pc/inst/stopppp - 775 sys sys 1018469719 250
-sys/lib/dist/pc/inst/textonly - 775 sys sys 1032539034 154
-sys/lib/dist/pc/inst/watchfd - 775 sys sys 1019322599 315
+sys/lib/dist/pc/inst/textonly - 775 sys sys 1112361039 182
+sys/lib/dist/pc/inst/watchfd - 775 sys sys 1112361039 361
 sys/lib/dist/pc/inst/xxx - 775 sys sys 1018469719 160
 sys/lib/dist/pc/mkfile - 664 sys sys 1063856155 2026
 sys/lib/dist/pc/plan9.ini - 664 sys sys 1020361168 512
 sys/lib/dist/pc/plan9.ini.blank - 664 sys sys 1018469720 512
 sys/lib/dist/pc/plan9.ini.cd - 664 sys sys 1092148201 357
 sys/lib/dist/pc/plan9.ini.vmware - 664 sys sys 1045500078 168
-sys/lib/dist/pc/proto - 664 sys sys 1112039934 4332
+sys/lib/dist/pc/proto - 664 sys sys 1112361036 4249
 sys/lib/dist/pc/sub - 20000000775 sys sys 1018640631 0
 sys/lib/dist/pc/sub/a: - 775 sys sys 1018469726 481
 sys/lib/dist/pc/sub/bind - 775 sys sys 1018469726 207
@@ -4045,7 +4045,7 @@ sys/lib/man/secindex - 775 sys sys 956337727 322
 sys/lib/man/title - 664 sys sys 1019915894 746
 sys/lib/man/trademarks - 664 sys sys 958527089 1838
 sys/lib/mimetype - 664 sys sys 1102352651 6153
-sys/lib/newuser - 775 sys sys 1102595253 1200
+sys/lib/newuser - 775 sys sys 1112362340 1226
 sys/lib/plumb - 20000000775 sys sys 944957365 0
 sys/lib/plumb/basic - 664 sys sys 1070330856 2930
 sys/lib/plumb/fileaddr - 664 sys sys 944957365 88
@@ -4824,6 +4824,7 @@ sys/man/1/vnc - 664 sys sys 1045501432 4186
 sys/man/1/vt - 664 sys sys 1018386774 2210
 sys/man/1/wc - 664 sys sys 944959675 908
 sys/man/1/who - 664 sys sys 944959674 332
+sys/man/1/winwatch - 664 sys sys 1112362775 470
 sys/man/1/xd - 664 sys sys 944959674 1517
 sys/man/1/yacc - 664 sys sys 944959676 3273
 sys/man/1/yesterday - 664 sys sys 1070288431 2348
@@ -5023,7 +5024,7 @@ sys/man/4/execnet - 664 sys sys 1019866708 1069
 sys/man/4/exportfs - 664 sys sys 1105574692 4692
 sys/man/4/ext2srv - 664 sys sys 1055692986 2409
 sys/man/4/factotum - 664 sys sys 1107836362 14708
-sys/man/4/fossil - 664 sys sys 1101668322 9564
+sys/man/4/fossil - 664 sys sys 1112368411 9546
 sys/man/4/fs - 664 sys sys 1019058716 3387
 sys/man/4/ftpfs - 664 sys sys 1048285446 4327
 sys/man/4/import - 664 sys sys 1034195346 2204
@@ -5142,7 +5143,7 @@ sys/man/8/mksacfs - 664 sys sys 964886843 710
 sys/man/8/mouse - 664 sys sys 971455511 2476
 sys/man/8/na - 664 sys sys 958527089 859
 sys/man/8/ndb - 664 sys sys 1108476849 9939
-sys/man/8/newuser - 664 sys sys 954305551 2343
+sys/man/8/newuser - 664 sys sys 1112362338 2418
 sys/man/8/nfsserver - 664 sys sys 1017251291 3397
 sys/man/8/pcmcia - 664 sys sys 944959679 408
 sys/man/8/pem - 664 sys sys 1060263669 1189
@@ -5386,7 +5387,7 @@ sys/src/9/pc/ether8169.c - 664 sys sys 1110882037 22704
 sys/src/9/pc/ether82543gc.c - 664 sys sys 1055689887 32296
 sys/src/9/pc/ether82557.c - 664 sys sys 1098848151 30040
 sys/src/9/pc/ether83815.c - 664 sys sys 1081706477 23479
-sys/src/9/pc/ether8390.c - 664 sys sys 1071245462 17557
+sys/src/9/pc/ether8390.c - 664 sys sys 1112382834 17701
 sys/src/9/pc/ether8390.h - 664 sys sys 1015014517 1511
 sys/src/9/pc/etherdp83820.c - 664 sys sys 1083469193 29134
 sys/src/9/pc/etherec2t.c - 664 sys sys 1086960044 4039
@@ -5429,7 +5430,7 @@ sys/src/9/pc/pccpuf - 664 sys sys 1073851852 1315
 sys/src/9/pc/pcdisk - 664 sys sys 1073851851 1427
 sys/src/9/pc/pcf - 664 sys sys 1104430623 1485
 sys/src/9/pc/pcfl - 664 sys sys 1042004821 1563
-sys/src/9/pc/pcflop - 664 sys sys 1104430611 1438
+sys/src/9/pc/pcflop - 664 sys sys 1112361040 1454
 sys/src/9/pc/pci.c - 664 sys sys 1107436009 25850
 sys/src/9/pc/pcmciamodem.c - 664 sys sys 1099761153 1586
 sys/src/9/pc/pcmkfile - 664 sys sys 1109303822 101
@@ -5445,7 +5446,7 @@ sys/src/9/pc/screen.h - 664 sys sys 1060267144 3797
 sys/src/9/pc/sd53c8xx.c - 664 sys sys 1086987325 52219
 sys/src/9/pc/sd53c8xx.i - 664 sys sys 1045063730 27355
 sys/src/9/pc/sd53c8xx.n - 664 sys sys 1032059019 12455
-sys/src/9/pc/sdata.c - 664 sys sys 1107436009 51019
+sys/src/9/pc/sdata.c - 664 sys sys 1112382836 51083
 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
@@ -6521,7 +6522,7 @@ sys/src/boot/pc/dosboot.c - 664 sys sys 1097716791 11240
 sys/src/boot/pc/dosfs.h - 664 sys sys 1032215924 1467
 sys/src/boot/pc/eoffs - 664 sys sys 1015007950 0
 sys/src/boot/pc/error.h - 664 sys sys 1015007950 3081
-sys/src/boot/pc/ether.c - 664 sys sys 1107882190 5090
+sys/src/boot/pc/ether.c - 664 sys sys 1112382847 5090
 sys/src/boot/pc/ether2000.c - 664 sys sys 1015007950 2609
 sys/src/boot/pc/ether2114x.c - 664 sys sys 1066618033 37048
 sys/src/boot/pc/ether589.c - 664 sys sys 1107921511 4620
@@ -6531,7 +6532,7 @@ sys/src/boot/pc/ether8139.c - 664 sys sys 1102429126 14806
 sys/src/boot/pc/ether8169.c - 664 sys sys 1106018997 18687
 sys/src/boot/pc/ether82557.c - 664 sys sys 1098848150 18911
 sys/src/boot/pc/ether83815.c - 664 sys sys 1019537742 19576
-sys/src/boot/pc/ether8390.c - 664 sys sys 1015007951 16065
+sys/src/boot/pc/ether8390.c - 664 sys sys 1112382847 16209
 sys/src/boot/pc/ether8390.h - 664 sys sys 1015007951 1392
 sys/src/boot/pc/etherec2t.c - 664 sys sys 1015007951 3598
 sys/src/boot/pc/etherelnk3.c - 664 sys sys 1034454878 44068
@@ -6572,7 +6573,7 @@ sys/src/boot/pc/queue.c - 664 sys sys 1015007954 566
 sys/src/boot/pc/sd.h - 664 sys sys 1094674489 2271
 sys/src/boot/pc/sd53c8xx.c - 664 sys sys 1077033951 52135
 sys/src/boot/pc/sd53c8xx.i - 664 sys sys 1015007955 27245
-sys/src/boot/pc/sdata.c - 664 sys sys 1097716793 38020
+sys/src/boot/pc/sdata.c - 664 sys sys 1112382847 38084
 sys/src/boot/pc/sdmylex.c - 664 sys sys 1015007955 28743
 sys/src/boot/pc/sdscsi.c - 664 sys sys 1077033682 7022
 sys/src/boot/pc/trap.c - 664 sys sys 1018462833 7098
@@ -11196,7 +11197,7 @@ sys/src/cmd/wikifs/wdir.c - 664 sys sys 1018211094 876
 sys/src/cmd/wikifs/wiki.h - 664 sys sys 1018323492 1891
 sys/src/cmd/wikifs/wiki2html.c - 664 sys sys 1018211094 815
 sys/src/cmd/wikifs/wiki2text.c - 664 sys sys 1018211094 779
-sys/src/cmd/winwatch.c - 664 sys sys 1040452635 4593
+sys/src/cmd/winwatch.c - 664 sys sys 1112362775 4614
 sys/src/cmd/xd.c - 664 sys sys 944961355 5735
 sys/src/cmd/yacc.c - 664 sys sys 984717754 57876
 sys/src/fs - 20000000775 sys sys 1015110109 0
@@ -12483,4 +12484,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
-acme/mail/386/Mail - 775 sys sys 1112328581 179119
+386/bin/winwatch - 775 sys sys 1112414831 143405

+ 36 - 35
dist/replica/plan9.db

@@ -502,7 +502,7 @@
 386/bin/webfs - 775 sys sys 1109132011 349163
 386/bin/webfsget - 775 sys sys 1104122092 39143
 386/bin/wikifs - 775 sys sys 1108354569 201169
-386/bin/winwatch - 775 sys sys 1106799182 143376
+386/bin/winwatch - 775 sys sys 1112414831 143405
 386/bin/xd - 775 sys sys 1104122093 64039
 386/bin/xmr - 775 sys sys 1104122093 40157
 386/bin/xms - 775 sys sys 1104122093 40735
@@ -725,7 +725,7 @@ acme/wiki/src/mkfile - 664 sys sys 1015011266 138
 acme/wiki/src/util.c - 664 sys sys 1016901956 1176
 acme/wiki/src/wiki.c - 664 sys sys 1109869230 10727
 acme/wiki/src/win.c - 664 sys sys 1016901957 5106
-acme/wiki/wiki.diff - 775 sys sys 1015011266 283
+acme/wiki/wiki.diff - 775 sys sys 1112362985 525
 adm - 20000000775 adm adm 1017438729 0
 adm/cache - 664 adm adm 1020313578 0
 adm/keys - 660 adm adm 1020313578 0
@@ -870,7 +870,7 @@ 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 1071079179 996
-dist/replica/plan9.proto - 664 sys sys 1104813012 2497
+dist/replica/plan9.proto - 664 sys sys 1112361655 2500
 env - 20000000775 sys sys 1015094872 0
 fd - 20000000775 sys sys 947958544 0
 lib - 20000000775 sys sys 958504315 0
@@ -2823,7 +2823,7 @@ lp/prob - 20000000777 sys sys 958199268 0
 lp/queue - 20000000777 sys sys 958199268 0
 lp/tmp - 20000000777 sys sys 958199268 0
 mail - 20000000775 upas upas 953344765 0
-mail/box - 20000000775 upas upas 1018729988 0
+mail/box - 20000000777 upas upas 1039727907 0
 mail/box/glenda - 20000000775 glenda glenda 1019530541 0
 mail/box/glenda/L.mbox - 4000000666 glenda glenda 1018730020 0
 mail/box/glenda/mbox - 10000000662 glenda glenda 1019530558 10699
@@ -3597,24 +3597,24 @@ sys/lib/dist/pc/glenda/lib/first.window - 775 sys sys 1018469723 143
 sys/lib/dist/pc/glenda/lib/profile - 664 sys sys 1032883600 327
 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 1019240165 899
+sys/lib/dist/pc/inst/bootfloppy - 775 sys sys 1112361036 903
 sys/lib/dist/pc/inst/bootplan9 - 775 sys sys 1019534696 1584
-sys/lib/dist/pc/inst/bootsetup - 775 sys sys 1107839820 3572
-sys/lib/dist/pc/inst/bootwin9x - 775 sys sys 1020384273 2525
+sys/lib/dist/pc/inst/bootsetup - 775 sys sys 1112361037 3688
+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 1063856192 538
+sys/lib/dist/pc/inst/configfs - 775 sys sys 1112361037 568
 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 1111771991 2743
-sys/lib/dist/pc/inst/download - 775 sys sys 1063856193 1237
+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 1111771991 1982
-sys/lib/dist/pc/inst/fmtventi - 775 sys sys 1063856189 3345
+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/gui - 775 sys sys 1032539034 79
 sys/lib/dist/pc/inst/halt - 775 sys sys 1063856192 497
 sys/lib/dist/pc/inst/hasmbr - 775 sys sys 1018469719 171
@@ -3624,35 +3624,35 @@ sys/lib/dist/pc/inst/isext2 - 775 sys sys 1018469719 204
 sys/lib/dist/pc/inst/isfat - 775 sys sys 1018469719 457
 sys/lib/dist/pc/inst/isfossil - 775 sys sys 1063856189 385
 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 1111771992 1941
+sys/lib/dist/pc/inst/isventi - 775 sys sys 1112361038 227
+sys/lib/dist/pc/inst/isventiarenas - 775 sys sys 1112361038 258
+sys/lib/dist/pc/inst/isventiisect - 775 sys sys 1112361038 256
+sys/lib/dist/pc/inst/main - 775 sys sys 1112361039 1952
 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 1111771992 182
+sys/lib/dist/pc/inst/mountdist - 775 sys sys 1112360993 5129
+sys/lib/dist/pc/inst/mountfossil - 775 sys sys 1112361039 2511
+sys/lib/dist/pc/inst/mountfs - 775 sys sys 1112361039 190
 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 1111771992 1820
+sys/lib/dist/pc/inst/partdisk - 775 sys sys 1112361039 1828
 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/replcfg - 775 sys sys 1112361039 399
 sys/lib/dist/pc/inst/startether - 775 sys sys 1018640315 513
 sys/lib/dist/pc/inst/startppp - 775 sys sys 1019058715 577
 sys/lib/dist/pc/inst/startwin - 775 sys sys 1018469719 776
 sys/lib/dist/pc/inst/stop - 775 sys sys 1033073371 1148
 sys/lib/dist/pc/inst/stopether - 775 sys sys 1018469719 269
 sys/lib/dist/pc/inst/stopppp - 775 sys sys 1018469719 250
-sys/lib/dist/pc/inst/textonly - 775 sys sys 1032539034 154
-sys/lib/dist/pc/inst/watchfd - 775 sys sys 1019322599 315
+sys/lib/dist/pc/inst/textonly - 775 sys sys 1112361039 182
+sys/lib/dist/pc/inst/watchfd - 775 sys sys 1112361039 361
 sys/lib/dist/pc/inst/xxx - 775 sys sys 1018469719 160
 sys/lib/dist/pc/mkfile - 664 sys sys 1063856155 2026
 sys/lib/dist/pc/plan9.ini - 664 sys sys 1020361168 512
 sys/lib/dist/pc/plan9.ini.blank - 664 sys sys 1018469720 512
 sys/lib/dist/pc/plan9.ini.cd - 664 sys sys 1092148201 357
 sys/lib/dist/pc/plan9.ini.vmware - 664 sys sys 1045500078 168
-sys/lib/dist/pc/proto - 664 sys sys 1112039934 4332
+sys/lib/dist/pc/proto - 664 sys sys 1112361036 4249
 sys/lib/dist/pc/sub - 20000000775 sys sys 1018640631 0
 sys/lib/dist/pc/sub/a: - 775 sys sys 1018469726 481
 sys/lib/dist/pc/sub/bind - 775 sys sys 1018469726 207
@@ -4045,7 +4045,7 @@ sys/lib/man/secindex - 775 sys sys 956337727 322
 sys/lib/man/title - 664 sys sys 1019915894 746
 sys/lib/man/trademarks - 664 sys sys 958527089 1838
 sys/lib/mimetype - 664 sys sys 1102352651 6153
-sys/lib/newuser - 775 sys sys 1102595253 1200
+sys/lib/newuser - 775 sys sys 1112362340 1226
 sys/lib/plumb - 20000000775 sys sys 944957365 0
 sys/lib/plumb/basic - 664 sys sys 1070330856 2930
 sys/lib/plumb/fileaddr - 664 sys sys 944957365 88
@@ -4824,6 +4824,7 @@ sys/man/1/vnc - 664 sys sys 1045501432 4186
 sys/man/1/vt - 664 sys sys 1018386774 2210
 sys/man/1/wc - 664 sys sys 944959675 908
 sys/man/1/who - 664 sys sys 944959674 332
+sys/man/1/winwatch - 664 sys sys 1112362775 470
 sys/man/1/xd - 664 sys sys 944959674 1517
 sys/man/1/yacc - 664 sys sys 944959676 3273
 sys/man/1/yesterday - 664 sys sys 1070288431 2348
@@ -5023,7 +5024,7 @@ sys/man/4/execnet - 664 sys sys 1019866708 1069
 sys/man/4/exportfs - 664 sys sys 1105574692 4692
 sys/man/4/ext2srv - 664 sys sys 1055692986 2409
 sys/man/4/factotum - 664 sys sys 1107836362 14708
-sys/man/4/fossil - 664 sys sys 1101668322 9564
+sys/man/4/fossil - 664 sys sys 1112368411 9546
 sys/man/4/fs - 664 sys sys 1019058716 3387
 sys/man/4/ftpfs - 664 sys sys 1048285446 4327
 sys/man/4/import - 664 sys sys 1034195346 2204
@@ -5142,7 +5143,7 @@ sys/man/8/mksacfs - 664 sys sys 964886843 710
 sys/man/8/mouse - 664 sys sys 971455511 2476
 sys/man/8/na - 664 sys sys 958527089 859
 sys/man/8/ndb - 664 sys sys 1108476849 9939
-sys/man/8/newuser - 664 sys sys 954305551 2343
+sys/man/8/newuser - 664 sys sys 1112362338 2418
 sys/man/8/nfsserver - 664 sys sys 1017251291 3397
 sys/man/8/pcmcia - 664 sys sys 944959679 408
 sys/man/8/pem - 664 sys sys 1060263669 1189
@@ -5386,7 +5387,7 @@ sys/src/9/pc/ether8169.c - 664 sys sys 1110882037 22704
 sys/src/9/pc/ether82543gc.c - 664 sys sys 1055689887 32296
 sys/src/9/pc/ether82557.c - 664 sys sys 1098848151 30040
 sys/src/9/pc/ether83815.c - 664 sys sys 1081706477 23479
-sys/src/9/pc/ether8390.c - 664 sys sys 1071245462 17557
+sys/src/9/pc/ether8390.c - 664 sys sys 1112382834 17701
 sys/src/9/pc/ether8390.h - 664 sys sys 1015014517 1511
 sys/src/9/pc/etherdp83820.c - 664 sys sys 1083469193 29134
 sys/src/9/pc/etherec2t.c - 664 sys sys 1086960044 4039
@@ -5429,7 +5430,7 @@ sys/src/9/pc/pccpuf - 664 sys sys 1073851852 1315
 sys/src/9/pc/pcdisk - 664 sys sys 1073851851 1427
 sys/src/9/pc/pcf - 664 sys sys 1104430623 1485
 sys/src/9/pc/pcfl - 664 sys sys 1042004821 1563
-sys/src/9/pc/pcflop - 664 sys sys 1104430611 1438
+sys/src/9/pc/pcflop - 664 sys sys 1112361040 1454
 sys/src/9/pc/pci.c - 664 sys sys 1107436009 25850
 sys/src/9/pc/pcmciamodem.c - 664 sys sys 1099761153 1586
 sys/src/9/pc/pcmkfile - 664 sys sys 1109303822 101
@@ -5445,7 +5446,7 @@ sys/src/9/pc/screen.h - 664 sys sys 1060267144 3797
 sys/src/9/pc/sd53c8xx.c - 664 sys sys 1086987325 52219
 sys/src/9/pc/sd53c8xx.i - 664 sys sys 1045063730 27355
 sys/src/9/pc/sd53c8xx.n - 664 sys sys 1032059019 12455
-sys/src/9/pc/sdata.c - 664 sys sys 1107436009 51019
+sys/src/9/pc/sdata.c - 664 sys sys 1112382836 51083
 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
@@ -6521,7 +6522,7 @@ sys/src/boot/pc/dosboot.c - 664 sys sys 1097716791 11240
 sys/src/boot/pc/dosfs.h - 664 sys sys 1032215924 1467
 sys/src/boot/pc/eoffs - 664 sys sys 1015007950 0
 sys/src/boot/pc/error.h - 664 sys sys 1015007950 3081
-sys/src/boot/pc/ether.c - 664 sys sys 1107882190 5090
+sys/src/boot/pc/ether.c - 664 sys sys 1112382847 5090
 sys/src/boot/pc/ether2000.c - 664 sys sys 1015007950 2609
 sys/src/boot/pc/ether2114x.c - 664 sys sys 1066618033 37048
 sys/src/boot/pc/ether589.c - 664 sys sys 1107921511 4620
@@ -6531,7 +6532,7 @@ sys/src/boot/pc/ether8139.c - 664 sys sys 1102429126 14806
 sys/src/boot/pc/ether8169.c - 664 sys sys 1106018997 18687
 sys/src/boot/pc/ether82557.c - 664 sys sys 1098848150 18911
 sys/src/boot/pc/ether83815.c - 664 sys sys 1019537742 19576
-sys/src/boot/pc/ether8390.c - 664 sys sys 1015007951 16065
+sys/src/boot/pc/ether8390.c - 664 sys sys 1112382847 16209
 sys/src/boot/pc/ether8390.h - 664 sys sys 1015007951 1392
 sys/src/boot/pc/etherec2t.c - 664 sys sys 1015007951 3598
 sys/src/boot/pc/etherelnk3.c - 664 sys sys 1034454878 44068
@@ -6572,7 +6573,7 @@ sys/src/boot/pc/queue.c - 664 sys sys 1015007954 566
 sys/src/boot/pc/sd.h - 664 sys sys 1094674489 2271
 sys/src/boot/pc/sd53c8xx.c - 664 sys sys 1077033951 52135
 sys/src/boot/pc/sd53c8xx.i - 664 sys sys 1015007955 27245
-sys/src/boot/pc/sdata.c - 664 sys sys 1097716793 38020
+sys/src/boot/pc/sdata.c - 664 sys sys 1112382847 38084
 sys/src/boot/pc/sdmylex.c - 664 sys sys 1015007955 28743
 sys/src/boot/pc/sdscsi.c - 664 sys sys 1077033682 7022
 sys/src/boot/pc/trap.c - 664 sys sys 1018462833 7098
@@ -11196,7 +11197,7 @@ sys/src/cmd/wikifs/wdir.c - 664 sys sys 1018211094 876
 sys/src/cmd/wikifs/wiki.h - 664 sys sys 1018323492 1891
 sys/src/cmd/wikifs/wiki2html.c - 664 sys sys 1018211094 815
 sys/src/cmd/wikifs/wiki2text.c - 664 sys sys 1018211094 779
-sys/src/cmd/winwatch.c - 664 sys sys 1040452635 4593
+sys/src/cmd/winwatch.c - 664 sys sys 1112362775 4614
 sys/src/cmd/xd.c - 664 sys sys 944961355 5735
 sys/src/cmd/yacc.c - 664 sys sys 984717754 57876
 sys/src/fs - 20000000775 sys sys 1015110109 0

+ 36 - 0
dist/replica/plan9.log

@@ -14027,3 +14027,39 @@
 1112270538 11 d rc/bin/service/_il17007 - 775 sys sys 1016832393 0
 1112277740 0 c rc/bin/reboot - 775 sys sys 1112276658 39
 1112329951 0 c acme/mail/386/Mail - 775 sys sys 1112328581 179119
+1112362357 0 m mail/box - 20000000777 upas upas 1039727907 0
+1112362357 1 c sys/lib/newuser - 775 sys sys 1112362340 1226
+1112362357 2 c sys/lib/dist/pc/inst/bootfloppy - 775 sys sys 1112361036 903
+1112362357 3 c sys/lib/dist/pc/inst/bootsetup - 775 sys sys 1112361037 3688
+1112362357 4 c sys/lib/dist/pc/inst/bootwin9x - 775 sys sys 1112361037 2527
+1112362357 5 c sys/lib/dist/pc/inst/configfs - 775 sys sys 1112361037 568
+1112362357 6 c sys/lib/dist/pc/inst/copydist - 775 sys sys 1112361037 713
+1112362357 7 c sys/lib/dist/pc/inst/defs - 664 sys sys 1112361037 2439
+1112362357 8 c sys/lib/dist/pc/inst/download - 775 sys sys 1112361038 1217
+1112362357 9 c sys/lib/dist/pc/inst/fmtfossil - 775 sys sys 1112361038 1981
+1112362357 10 c sys/lib/dist/pc/inst/fmtventi - 775 sys sys 1112361038 3733
+1112362357 11 c sys/lib/dist/pc/inst/isventi - 775 sys sys 1112361038 227
+1112362357 12 c sys/lib/dist/pc/inst/isventiarenas - 775 sys sys 1112361038 258
+1112362357 13 c sys/lib/dist/pc/inst/isventiisect - 775 sys sys 1112361038 256
+1112362357 14 c sys/lib/dist/pc/inst/main - 775 sys sys 1112361039 1952
+1112362357 15 c sys/lib/dist/pc/inst/mountdist - 775 sys sys 1112360993 5129
+1112362357 16 c sys/lib/dist/pc/inst/mountfossil - 775 sys sys 1112361039 2511
+1112362357 17 c sys/lib/dist/pc/inst/mountfs - 775 sys sys 1112361039 190
+1112362357 18 c sys/lib/dist/pc/inst/partdisk - 775 sys sys 1112361039 1828
+1112362357 19 c sys/lib/dist/pc/inst/replcfg - 775 sys sys 1112361039 399
+1112362357 20 c sys/lib/dist/pc/inst/textonly - 775 sys sys 1112361039 182
+1112362357 21 c sys/lib/dist/pc/inst/watchfd - 775 sys sys 1112361039 361
+1112362357 22 c sys/lib/dist/pc/proto - 664 sys sys 1112361036 4249
+1112362357 23 c sys/man/8/newuser - 664 sys sys 1112362338 2418
+1112362357 24 c sys/src/9/pc/pcflop - 664 sys sys 1112361040 1454
+1112362357 25 c dist/replica/plan9.proto - 664 sys sys 1112361655 2500
+1112364157 0 c acme/wiki/wiki.diff - 775 sys sys 1112362985 525
+1112364157 1 a sys/man/1/winwatch - 664 sys sys 1112362775 470
+1112364157 2 c sys/src/cmd/winwatch.c - 664 sys sys 1112362775 4614
+1112369559 0 c sys/man/4/fossil - 664 sys sys 1112368411 9546
+1112383960 0 c sys/src/9/pc/ether8390.c - 664 sys sys 1112382834 17701
+1112383960 1 c sys/src/9/pc/sdata.c - 664 sys sys 1112382836 51083
+1112383960 2 c sys/src/boot/pc/ether.c - 664 sys sys 1112382847 5090
+1112383960 3 c sys/src/boot/pc/ether8390.c - 664 sys sys 1112382847 16209
+1112383960 4 c sys/src/boot/pc/sdata.c - 664 sys sys 1112382847 38084
+1112416368 0 c 386/bin/winwatch - 775 sys sys 1112414831 143405

+ 1 - 1
dist/replica/plan9.proto

@@ -7,7 +7,7 @@ adm	- adm adm
 
 # upas owns mail
 mail	- upas upas
-	box	- upas upas
+	box	d777 upas upas
 		glenda	- glenda glenda
 			L.mbox	l666 glenda glenda
 			mbox	a662 glenda glenda

+ 1 - 1
sys/lib/dist/pc/inst/bootfloppy

@@ -33,7 +33,7 @@ if(! ~ `{ls -l $adisk | awk '{print $6}'} 1474560){
 
 log Formatting boot floppy
 disk/format -b /386/pbs \
-	-fd $adisk /n/kfs/386/9load /n/kfs/386/9pcdisk.gz \
+	-fd $adisk /n/newfs/386/9load /n/newfs/386/9pcdisk.gz \
 	/tmp/plan9ini.bak
 x=$status
 

+ 7 - 3
sys/lib/dist/pc/inst/bootsetup

@@ -31,6 +31,10 @@ case go
 				echo bootfile'='$bootfs!/386/9pcdisk
 				echo 'bootdisk=local!'^$sfs
 			}
+			if(~ $fstype fossil+venti){
+				venti=`{echo $ventiarena | sed 's;/dev;#S;'}
+				echo venti'='^$venti
+			}
 			grep -v '(^\[)|menuitem|adisk|bootfile|bootdisk|bootargs|nobootprompt|mouseport|vgasize|monitor|cdboot' /tmp/plan9.orig
 			echo 'mouseport='^$mouseport
 			echo 'monitor='^$monitor
@@ -51,7 +55,7 @@ case go
 	if(~ $need9fatformat yes){
 		log Initializing Plan 9 FAT partition.
 		disk/format -r 2 -d -b /386/pbs \
-			/dev/$disk/9fat /n/kfs/386/9load
+			/dev/$disk/9fat /n/newfs/386/9load
 		# silently install pbslba if the partition is way into the disk.
 		# it''s our only hope.  only need this for >8.5GB into the disk.
 		# but...
@@ -73,8 +77,8 @@ case go
 	}
 
 	if(! test -f /n/9fat/4e){
-		logprog cp /n/kfs/386/9load /n/9fat/9load
-		logprog cp /n/kfs/386/9pcf /n/9fat/9pcf
+		logprog cp /n/newfs/386/9load /n/9fat/9load
+		logprog cp /n/newfs/386/9pcf /n/9fat/9pcf
 		if(test -f /n/9fat/plan9.ini && ! test -f /n/9fat/plan9-3e.ini)
 			logprog mv /n/9fat/plan9.ini /n/9fat/plan9-3e.ini
 		if(test -f /n/9fat/9pcdisk && ! test -f /n/9fat/9pc3e)

+ 1 - 1
sys/lib/dist/pc/inst/bootwin9x

@@ -23,7 +23,7 @@ if(! test -d /n/c:/plan9 && ! mkdir /n/c:/plan9) {
 	exit bad
 }
 
-if(! cp /n/kfs/386/^(9load ld.com 9pcdisk) /tmp/plan9ini.bak /n/c:/plan9) {
+if(! cp /n/newfs/386/^(9load ld.com 9pcdisk) /tmp/plan9ini.bak /n/c:/plan9) {
 	echo 'Could not copy Plan 9 boot files into /n/c:/plan9.'
 	exit bad
 }

+ 7 - 7
sys/lib/dist/pc/inst/configfs

@@ -4,7 +4,7 @@
 
 switch($1){
 case checkdone
-	if(! ~ $fstype kfs fossil){
+	if(! ~ $fstype fossil fossil+venti){
 		configfs=ready
 		export configfs
 	}
@@ -12,13 +12,13 @@ case checkdone
 case go
 	echo 'You can install the following types of file systems:'
 	echo
-	echo '	fossil			an archival (dump) file server'
-	echo '	kfs				the old Plan 9 on-disk file server'
+	echo '	fossil			the new Plan9 fileserver'
+	echo '	fossil+venti	fossil + a archival dump server'
 	echo
-	echo 'If you choose to install fossil, you can add Venti later,'
-	echo 'assuming you leave enough disk space for it.'
-	echo 
-	prompt -d fossil 'File system' fossil kfs
+	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
 }

+ 5 - 5
sys/lib/dist/pc/inst/copydist

@@ -10,7 +10,7 @@ case checkready
 		export copydist
 		exit
 	}
-	if(test -f /n/kfs/dist/replica/didplan9){
+	if(test -f /n/newfs/dist/replica/didplan9){
 		copydist=done
 		export copydist
 		exit
@@ -18,13 +18,13 @@ case checkready
 case go
 	inst/watchfd applylog 0 `{ls -l /n/dist/dist/replica/plan9.log | awk '{print $6}'} 'Installing file system' &
 	replica/pull -c /rc/bin/inst/replcfg
-	if(~ $status '' *conflicts || test -f /n/kfs/dist/replica/didplan9witherrors)
-		>/n/kfs/dist/replica/didplan9
+	if(~ $status '' *conflicts || test -f /n/newfs/dist/replica/didplan9witherrors)
+		>/n/newfs/dist/replica/didplan9
 	if not
-		>/n/kfs/dist/replica/didplan9witherrors
+		>/n/newfs/dist/replica/didplan9witherrors
 
 case checkdone
-	if(! test -f /n/kfs/dist/replica/didplan9){
+	if(! test -f /n/newfs/dist/replica/didplan9){
 		copydist=notdone
 		export copydist
 	}

+ 0 - 17
sys/lib/dist/pc/inst/defs

@@ -159,21 +159,4 @@ fn isipdevup {
 	grep -s $1 /net/ipifc/*/status >[2]/dev/null 
 }
 
-fn kfsname {
-	echo $1 | sed 's;/;_;g'
-}
-
-# make sure the kfs server for /dev/$1/fs is running.
-# we use /srv/kfs.$1
-#
-
-fn runkfs {
-	if(! test -f /srv/kfs.$1 || ! mount /srv/kfs.$1 /n/kremvax) {
-		rm -f /srv/kfs.$1 /srv/kfs.$1.cmd
-		disk/kfs -n$1 -f /dev/$1/fs
-	}
-	disk/kfscmd -n$1 allow
-}
-
-fstype=fossil
 

+ 10 - 9
sys/lib/dist/pc/inst/download

@@ -30,24 +30,25 @@ case go
 
 	# BUG make restartable
 	echo 'Downloading distribution package...'
-	if(! hget -vo /n/kfs/dist/_plan9.iso.bz2 $installurl/plan9.iso.bz2 |[2] bargraph -w 145,129,445,168 'downloading '^plan9.iso.bz2)
-		exit
-	mv /n/kfs/dist/_plan9.iso.bz2 /n/kfs/dist/plan9.iso.bz2
+	baropt='-w 145,129,445,168'
+	if(~ textinst 1)
+		baropt=-t
+	if(! hget -vo /n/newfs/dist/_plan9.iso.bz2 $installurl/plan9.iso.bz2 |[2] bargraph $baropt 'downloading '^plan9.iso.bz2)
+			exit
+	mv /n/newfs/dist/_plan9.iso.bz2 /n/newfs/dist/plan9.iso.bz2
 	if(~ $fstype fossil){
 		echo fsys main sync >>/srv/fscons
 	}
-	kname=`{kfsname $fs}
-	disk/kfscmd -n$kname sync
 
 	echo 'The distribution is downloaded.'
 
-	srvmedia=(disk/kfs -f $fs -n $kname)
-	mountmedia=(mount /srv/kfs.$kname /n/distmedia)
+	srvmedia=()
+	mountmedia=(mount /srv/fossil /n/distmedia)
 	distmediadir=/dist
-	export srvmedia mountmedia distmediadir
+	export distmediadir mountmedia distmedia
 	
 case checkdone
-	if(! test -f /n/kfs/dist/plan9.iso.bz2) {
+	if(! test -f /n/newfs/dist/plan9.iso.bz2) {
 		download=notdone
 		export download
 	}

+ 4 - 4
sys/lib/dist/pc/inst/fmtfossil

@@ -1,7 +1,7 @@
 #!/bin/rc
 
 # desc: initialize disks for a fossil server
-# prereq: 
+# prereq: configfs
 
 switch($1){
 case checkready checkdone
@@ -72,18 +72,18 @@ case go
 		# that retire after three days, in addition to the daily dumps at 5am
 		if(~ $fstype fossil+venti){
 			v=''
-			snap='-s 60 -a 0500 -t 2880'
+			snap='fsys main snaptime -s 60 -a 0500 -t 2880'
 		}
 		# otherwise, take the daily dumps but nothing else --
 		# we can't retire snapshots unless dumps are being archived
 		if not{
 			v='-V'
-			snap='-a 0500'
+			snap=''
 		}
 		echo \
 'fsys main config '^$f^'
 fsys main open '^$v^' -c '^$m^'
-# fsys main snaptime '^$snap^'
+'^$snap^'
 '		| fossil/conf -w $f
 	}
 	

+ 28 - 11
sys/lib/dist/pc/inst/fmtventi

@@ -1,7 +1,7 @@
 #!/bin/rc
 
 # desc: initialize disks for a venti server
-# prereq: choosefs
+# prereq: mountdist
 
 switch($1){
 case checkready checkdone
@@ -10,25 +10,42 @@ case checkready checkdone
 		export fmtventi
 		exit
 	}
-	ff=`{ls /dev/sd*/v.arenas* /dev/fs/v.arenas* >[2]/dev/null}
+	if(! test -e /bin/venti/fmtarenas || ! test -e /bin/venti/fmtisect || ! test -e /bin/venti/fmtindex){
+		bind -a /n/dist/386/bin/venti /bin/venti
+		if(! test -e /bin/venti/fmtarenas || ! test -e /bin/venti/fmtisect || ! test -e /bin/venti/fmtindex){
+			fmtventi=notdone
+			export fmtventi
+			exit
+		}
+	}
+	ff=`{ls /dev/sd*/arenas* /dev/fs/arenas* >[2]/dev/null}
+	if(~ $#ff 0){
+		fmtventi=notdone
+		export fmtventi
+		exit
+	}
 	gg=()
 	for(f in $ff)
 		if(isventi $f)
 			gg=($gg $f)
 	if(~ $#gg 0){
-		fmtventi=notdone
+		fmtventi=ready
 		export fmtventi
 		exit
 	}
+
+	ventiarena=$gg(1)
+	export ventiarena
+
 	fmtventi=done
 	export fmtventi
 	exit
 
 case go
-	ff=`{ls /dev/sd*/v.arenas* /dev/fs/v.arenas* >[2]/dev/null}
+	ff=`{ls /dev/sd*/arenas* /dev/fs/arenas* >[2]/dev/null}
 	if(~ $#ff 0){
 		echo 'You need to create a partition or partitions to hold the Venti arenas.'
-		echo 'The arena partition names must begin with "v.arenas".'
+		echo 'The arena partition names must begin with "arenas".'
 		echo
 		fmtventi=notdone
 		export fmtventi
@@ -56,10 +73,10 @@ case go
 	ventiarena=$aa
 	export ventiarena
 
-	gg=`{ls /dev/sd*/v.index* /dev/fs/v.index* >[2]/dev/null}
+	gg=`{ls /dev/sd*/isect* /dev/fs/isect* >[2]/dev/null}
 	if(~ $#gg 0){
 		echo 'You need to create a partition or partitions to hold the Venti indices.'
-		echo 'The index partition names must begin with "v.index".'
+		echo 'The index partition names must begin with "isect".'
 		echo
 		fmtventi=notdone
 		export fmtventi
@@ -123,7 +140,7 @@ case go
 	for(a in $fmta $fmti){
 		d=`{echo $a | sed 's!.*:(/.*/).*!\1!'}
 		if(! ~ $d $dd)
-			$dd=($dd $d)
+			dd=($dd $d)
 	}
 	for(d in $dd){
 		{
@@ -139,7 +156,7 @@ case go
 				i=`{echo $a | sed 's!(.*):(/.*/)(.*)!\1 \2 \2\3!'}
 				if(~ $i(2) $d){
 					echo $i(3) ...
-					venti/isect $i(1) $i(3) || echo bad >/tmp/fmt
+					venti/fmtisect $i(1) $i(3) || echo bad >/tmp/fmt
 					echo done with $i(3)
 				}
 			}
@@ -162,11 +179,11 @@ case go
 		for(i in $ventiindex)
 			echo isect $i
 		for(a in $ventiarena)
-			echo arenas $i
+			echo arenas $a
 	} | venti/conf -w $v
 
 	echo Initializing index...
-	venti/fmtindex -c $v
+	venti/fmtindex $v
 
 	echo Done with Venti!
 }

+ 2 - 2
sys/lib/dist/pc/inst/isventi

@@ -1,12 +1,12 @@
 #!/bin/rc
 
 if(! ~ $#* 1){
-	echo 'usage: isfossil /dev/sdC0/part' >[1=2]
+	echo 'usage: isventi /dev/sdC0/part' >[1=2]
 	exit usage
 }
 
 arg=$1
-if(! cmp -s <{dd -quiet 1 -if $arg -bs 1024 -iseek 127 |
+if(! cmp -s <{dd -quiet 1 -if $arg -bs 1024 -iseek 248 |
 	dd -quiet 1 -bs 13 -count 1} <{echo 'venti config'})
 	exit noconfig
 exit 0

+ 1 - 1
sys/lib/dist/pc/inst/isventiarenas

@@ -6,7 +6,7 @@ if(! ~ $#* 1){
 }
 
 arg=$1
-if(! cmp -s <{dd -quiet 1 -if $arg -bs 1024 -iseek 128 |
+if(! cmp -s <{dd -quiet 1 -if $arg -bs 1024 -iseek 256 |
 	dd -quiet 1 -bs 4 -count 1 | xd -b | sed 1q} <{echo '0000000  a9 e4 a5 e7'})
 	exit notarenas
 exit 0

+ 1 - 1
sys/lib/dist/pc/inst/isventiisect

@@ -6,7 +6,7 @@ if(! ~ $#* 1){
 }
 
 arg=$1
-if(! cmp -s <{dd -quiet 1 -if $arg -bs 1024 -iseek 128 |
+if(! cmp -s <{dd -quiet 1 -if $arg -bs 1024 -iseek 256 |
 	dd -quiet 1 -bs 4 -count 1 | xd -b | sed 1q} <{echo '0000000  d1 5c 5e c7'})
 	exit notisect
 exit 0

+ 2 - 1
sys/lib/dist/pc/inst/main

@@ -12,13 +12,14 @@ echo -n 'Preparing menu...'
 
 # must be topologically sorted (by prereq)
 tasks=(\
+	configfs\
 	partdisk prepdisk\
-	fmtventi\
 	fmtfossil\
 	mountfs\
 	configdist\
 	confignet\
 	mountdist\
+	fmtventi\
 	download\
 	copydist\
 	bootsetup finish stop\

+ 32 - 23
sys/lib/dist/pc/inst/mountdist

@@ -1,11 +1,5 @@
 #!/bin/rc
 
-# We don't support ext2 because I'm not motivated enough
-# to convert ext2srv, a server that only half works to begin with,
-# to 9P2000.  If someone else wants to update ext2srv, I'll be happy
-# to put back support for installing from ext2 partitions back.
-#			- rsc
-
 # prereq: mountfs configdist
 # desc: locate and mount the distribution
 
@@ -36,11 +30,11 @@ fn trycdimage{
 
 fn trycdimagebz2 {
 	if(test -f $1){
-		echo -n 'bunzip2 < '^$1^' >/n/kfs/dist/plan9.iso'
-		bunzip2 < $1 >/n/kfs/dist/_plan9.iso &&
-		mv /n/kfs/dist/_plan9.iso /n/kfs/dist/plan9.iso
+		echo -n 'bunzip2 < '^$1^' >/n/newfs/dist/plan9.iso'
+		bunzip2 < $1 >/n/newfs/dist/_plan9.iso &&
+		mv /n/newfs/dist/_plan9.iso /n/newfs/dist/plan9.iso
 		echo
-		trycdimage /n/kfs/dist/plan9.iso
+		trycdimage /n/newfs/dist/plan9.iso
 		mountdist=notdone
 		export mountdist
 		exit notdone
@@ -74,9 +68,10 @@ case checkready
 		
 case go
 	kfs=()
-	ext2=()
 	fat=()
+	ext2=()
 	x9660=()
+	fossil=()
 
 	echo Please wait... Scanning storage devices...
 
@@ -94,6 +89,8 @@ case go
 	#		ext2=($ext2 $i)
 		if(is9660 /tmp/localpart.$n)
 			x9660=($x9660 $i)
+		if(isfossil /tmp/localpart.$n)
+			fossil=($fossil $i)
 		echo
 	}
 	echo
@@ -104,39 +101,48 @@ case go
 		switch($i){
 		case $kfs
 			echo	'	'^$i^' (plan9 kfs)'
-	#	case $ext2
-	#		echo '	'^$i^' (linux ext2)'
 		case $fat
-			echo '	'^$i^' (microsoft fat)'
+			echo 	'	'^$i^' (microsoft fat)'
+		case $ext2
+			echo 	'	'^$i^' (linux ext2)'
 		case $x9660
-			echo '	'^$i^' (iso9660 cdrom)'
+			echo 	'	'^$i^' (iso9660 cdrom)'
+		case $fossil
+			echo 	'	'^$i^' (plan9 fossil)'
 		}
 	}
 	echo
 
 	mountstatus=x
 	while(! ~ $mountstatus ''){
-		prompt -w '' 'Distribution disk' $kfs $fat $x9660 #$ext2
+		prompt -w '' 'Distribution disk' $fat $x9660 $fossil
 		disk=$rd
 
 		srvmedia=()
 		mountmedia=()
 		switch($disk){
 		case $fs
-			mountmedia=(bind /n/kfs /n/distmedia)
+			mountmedia=(bind /n/newfs /n/distmedia)
 		case $kfs
 			kname=`{kfsname $disk}
 			srvmedia=(disk/kfs -f $disk -n $kname)
 			mountmedia=(mount /srv/kfs.$kname /n/distmedia)
-	#	case $ext2
-	#		srvmedia=(ext2srv -r)
-	#		mountmedia=(mount /srv/ext2 /n/distmedia $disk)
 		case $fat
 			srvmedia=(dossrv)
 			mountmedia=(mount /srv/dos /n/distmedia $disk)
+		case $ext2
+			srvmedia=(ext2srv -r)
+			mountmedia=(mount /srv/ext2 /n/distmedia $disk)
 		case $x9660
 			srvmedia=(9660srv)
 			mountmedia=(mount /srv/9660 /n/distmedia $disk)
+		case $fossil
+			echo 'srv fossil.mountdist' > /tmp/fossi.conf
+			echo 'fsys main config '^$disk >> /tmp/fossil.conf
+			echo 'fsys main open -AWVP' >> /tmp/fossil.conf
+			echo 'fsys main' >> /tmp/fossil.conf
+			srvmedia=(fossil/fossil -c '. /tmp/fossil.conf')
+			mountmedia=(mount /srv/fossil.mountdist /n/distmedia)
 		case *
 			echo Unknown disk type '(cannot happen)'
 			exit oops
@@ -185,6 +191,7 @@ case go
 		if(! havedist /n/distmedia/$dir)
 			echo 'No distribution found in '^`{cleanname /$dir}
 	}
+
 	distmediadir=$dir
 	export distmediadir
 
@@ -194,7 +201,7 @@ case checkdone
 		export mountdist
 		exit notdone
 	}
-	if(! havedist /n/distmedia/$distmediadir && ! havedist /n/kfs/dist){
+	if(! havedist /n/distmedia/$distmediadir && ! havedist /n/newfs/dist){
 		mountdist=notdone
 		export mountdist
 		exit notdone
@@ -204,6 +211,8 @@ case checkdone
 
 	if(test -f /n/distmedia/$distmediadir/dist/replica/plan9.db){
 		bind /n/distmedia/$distmediadir /n/dist
+		bind -a /n/dist/386/bin /bin
+		bind -a /n/dist/rc/bin /bin
 		exitifdone
 		mountdist=notdone
 		export mountdist
@@ -211,10 +220,10 @@ case checkdone
 	}
 
 	trycdimage /n/distmedia/$distmediadir/plan9.iso
-	trycdimage /n/kfs/dist/plan9.iso
+	trycdimage /n/newfs/dist/plan9.iso
 
 	trycdimagebz2 /n/distmedia/$distmediadir/plan9.iso.bz2
-	trycdimagebz2 /n/kfs/dist/plan9.iso.bz2
+	trycdimagebz2 /n/newfs/dist/plan9.iso.bz2
 
 	mountdist=notdone
 	export mountdist

+ 11 - 55
sys/lib/dist/pc/inst/mountfossil

@@ -2,11 +2,6 @@
 
 switch($1){
 case checkready checkdone
-	if(~ $fstype fossil+venti && ! ~ $fmtventi done){
-		mountfs=notdone
-		export mountfs
-		exit
-	}
 	if(! ~ $fmtfossil done){
 		mountfs=notdone
 		export mountfs
@@ -17,31 +12,16 @@ case checkready checkdone
 		export mountfs
 		exit
 	}
-	if(~ $fstype fossil+venti)
-	if(! ~ $#venti 1 || ! test -f $venti){
-		mountfs=ready
-		export mountfs
-		exit
-	}
 	if(! ~ $#fossil 1 || ! test -f $fossil){
 		mountfs=ready
 		export mountfs
 		exit
 	}
-	if(~ $fstype fossil+venti && ! ps | grep -s ' venti$'){
-		if(! logprog venti/venti -a tcp!127.1!17034 -c $venti >>[2]/srv/log){
-			echo 'venti: '^$status
-			mountfs=ready
-			export mountfs
-			exit oops
-		}
-		if(ps |grep -s ' fossil$'){
-			# reconnect to venti
-			echo fsys main venti 127.0.0.1 >>/srv/fscons
-		}
-	}
 	if(! ps | grep -s ' fossil$'){
-		{echo 'srv -p fscons'; echo 'srv -AP fossil'; fossil/conf $fossil | sed 's/^fsys main open .*/& -AWP/'}>/env/fossilconf
+		echo 'srv -p fscons' > /env/fossilconf
+		echo 'srv -AP fossil' >> /env/fossilconf
+		fossil/conf $fossil | sed 's/^fsys main open .*/& -AWVP/' |
+			sed 's/^fsys main snaptime .*//' >> /env/fossilconf
 		if(! logprog fossil/fossil -c .' /env/fossilconf'>>[2]/srv/log){
 			echo 'fossil: '^$status
 			mountfs=ready
@@ -54,7 +34,7 @@ case checkready checkdone
 			exit oops
 		}
 		cat /srv/fscons >>/srv/log &
-		if(! logprog mount -c /srv/fossil /n/fossil){
+		if(! logprog mount -c /srv/fossil /n/newfs){
 			echo 'mount: '^$status
 			mountfs=ready
 			export mountfs
@@ -63,37 +43,35 @@ case checkready checkdone
 		fs=$fossil
 		export fs
 	}
-	if(! test -s /n/fossil/adm/users){
+	if(! test -s /n/newfs/adm/users){
 		echo fsys main create /active/adm adm sys d775 >>/srv/fscons
 		echo fsys main create /active/adm/users adm sys 664 >>/srv/fscons
 		echo uname upas :upas >>/srv/fscons
 		echo users -w >>/srv/fscons
 		sleep 2
 	}
-	if(! test -s /n/fossil/adm/users){
+	if(! test -s /n/newfs/adm/users){
 		echo 'could not create /adm/users'
 		mountfs=ready
 		export mountfs
 		exit oops
 	}
 	for(i in dist dist/replica dist/replica/client){
-		if(! test -d /n/fossil/$i)
+		if(! test -d /n/newfs/$i)
 			echo fsys main create /active/$i sys sys d775 >>/srv/fscons
 		sleep 2
 	}
-	if(! test -d /n/fossil/dist/replica/client){
+	if(! test -d /n/newfs/dist/replica/client){
 		echo 'could not create /dist/replica/client'
 		mountfs=ready
 		export mountfs
 		exit oops
 	}
-	if(! test -e /n/fossil/dist/replica/client/plan9.db){
+	if(! test -e /n/newfs/dist/replica/client/plan9.db){
 		echo fsys main create /active/dist/replica/client/plan9.db sys sys 664 >>/srv/fscons
 		echo fsys main create /active/dist/replica/client/plan9.log sys sys a664 >>/srv/fscons
 	}
-	if(test -d /n/fossil/dist/replica/client && test -f /n/fossil/adm/users){
-		# the rest of the install assumes /n/kfs
-		bind -c /n/fossil /n/kfs
+	if(test -d /n/newfs/dist/replica/client && test -f /n/newfs/adm/users){
 		mountfs=done
 		export mountfs
 		exit
@@ -103,28 +81,6 @@ case checkready checkdone
 	exit
 
 case go
-	if(~ $fstype fossil+venti){
-		echo 'The following formatted Venti arenas were found.'
-		echo
-		echo 'Please choose one to use as the Venti server.'
-		echo
-		files=(`{ls /dev/sd*/v.arenas* /dev/fs/v.arenas* >[2]/dev/null})
-		ls -l $files
-		echo
-		if(~ $#venti 1 && ~ $venti $files)
-			default=(-d $venti)
-		if not if(~ $#files 1)
-			default=(-d $files)
-		if not
-			default=()
-		prompt $default 'Venti arena w/ config file' $files
-		if(! ~ $#venti 1 || ! ~ $venti $rd){
-			slay venti|rc
-			venti=$rd
-			export venti
-		}
-	}
-
 	echo 'The following partitions named fossil* were found.'
 	echo
 	echo 'Please choose one to use as the installation file system'

+ 1 - 1
sys/lib/dist/pc/inst/mountfs

@@ -1,7 +1,7 @@
 #!/bin/rc
 
 # desc: choose and mount file system partition
-# prereq: 
+# prereq: configfs
 
 switch($fstype){
 case fossil fossil+venti

+ 1 - 1
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: 
+# prereq: configfs
 
 switch($1){
 case go

+ 2 - 2
sys/lib/dist/pc/inst/replcfg

@@ -8,8 +8,8 @@ fn servermount { status='' }
 fn serverupdate { status='' }
 
 fn clientmount { status='' }
-c=/n/kfs/dist/replica
-clientroot=/n/kfs
+c=/n/newfs/dist/replica
+clientroot=/n/newfs
 clientproto=$c/plan9.proto
 clientdb=$c/client/plan9.db
 clientexclude=(dist/replica/client)

+ 3 - 0
sys/lib/dist/pc/inst/textonly

@@ -4,6 +4,9 @@
 cd /bin/inst
 . defs
 
+textinst=1
+export textinst
+
 tailfsrv &
 while(! test -f /srv/log)
 	sleep 1

+ 5 - 1
sys/lib/dist/pc/inst/watchfd

@@ -7,7 +7,11 @@ while(! ~ $#p 1) {
 }
 p=$p(1)
 
+baropt='-w 145,129,445,168'
+if(~ textinst 1)
+	baropt=-t
+
 {
 	while(test -f /proc/$p/fd)
 		grep '^ *'^$2^' ' /proc/$p/fd >[2]/dev/null
-} | awk '{print $9 " '^$3^'"; fflush("/dev/stdout")}' | bargraph -w 145,129,445,168 $4
+} | awk '{print $9 " '^$3^'"; fflush("/dev/stdout")}' | bargraph $baropt $4

+ 10 - 12
sys/lib/dist/pc/proto

@@ -23,8 +23,8 @@
 		disk	d555 sys sys
 			fdisk	555 sys sys
 			format	555 sys sys
-#			kfs	555 sys sys
-#			kfscmd	555 sys sys
+			kfs	555 sys sys
+			kfscmd	555 sys sys
 			mbr	555 sys sys
 			prep	555 sys sys
 		fossil	d555 sys sys
@@ -46,11 +46,11 @@
 			compactdb	555 sys sys /sys/lib/dist/pc/sub/compactdb
 			pull		555 sys sys
 		venti	d555 sys sys
-#VENTI			venti	555 sys sys
-#VENTI			conf		555 sys sys
-#VENTI			fmtarenas	555 sys sys
-#VENTI			fmtindex	555 sys sys
-#VENTI			fmtisect	555 sys sys
+#			venti	555 sys sys
+#			conf		555 sys sys
+#			fmtarenas	555 sys sys
+#			fmtindex	555 sys sys
+#			fmtisect	555 sys sys
 		9660srv	555 sys sys
 # acme could go
 #		acme	555 sys sys
@@ -73,8 +73,8 @@
 		ed	555 sys sys
 # if cpu goes, exportfs could go
 #		exportfs	555 sys sys
-		ext2srv	555 sys sys
-		fcp 555 sys sys
+#		ext2srv	555 sys sys
+		fcp		555	sys	sys
 		grep	555 sys sys
 		hget	555 sys sys
 		hoc	555 sys sys
@@ -132,10 +132,8 @@ n	d777 sys sys
 	c:	d000 sys sys
 	c	d000 sys sys
 	9fat	d000 sys sys
-	9	d000 sys sys
-	kfs	d000 sys sys	/sys/lib/dist/pc/empty
 	kremvax	d000 sys sys	/sys/lib/dist/pc/empty
-	fossil	d000 sys sys
+	newfs	d000 sys sys
 	dist	d000 sys sys	/sys/lib/dist/pc/empty
 	distmedia	d000 sys sys	/sys/lib/dist/pc/empty
 rc	d555 sys sys

+ 2 - 0
sys/lib/newuser

@@ -47,6 +47,8 @@ case cpu
 	if (! test -e /mnt/term/mnt/wsys) {
 		# cpu call from drawterm
 		font=/lib/font/bit/pelm/latin1.8.font
+		plumber
+		auth/factotum
 		exec rio
 	}
 case con

+ 29 - 0
sys/man/1/winwatch

@@ -0,0 +1,29 @@
+.TH WINWATCH 1
+.SH NAME
+winwatch \- monitor rio windows
+.SH SYNOPSIS
+.B winwatch
+[
+.B -f
+.I font
+]
+.SH DESCRIPTION
+.I Winwatch
+displays the labels of all current
+.IR rio (4)
+windows, refreshing the display every five seconds.
+Right clicking a window's label unhides, raises and gives focus to that window.
+Typing
+.B q
+or
+DEL
+quits
+.IR winwatch .
+.SH FILES
+.B /dev/wsys/*/label
+.SH SOURCE
+.B /sys/src/cmd/winwatch.c
+.SH SEE ALSO
+.IR rio (1),
+.IR window (1),
+.IR rio (4).

+ 1 - 1
sys/man/4/fossil

@@ -410,7 +410,7 @@ fsys main open -AWP
 fsys main
 create /active/adm adm sys d775
 create /active/adm/users adm sys 664
-users -w /active/adm/users
+users -w
 srv -p fscons
 srv fossil
 EOF

+ 16 - 17
sys/man/8/newuser

@@ -4,20 +4,18 @@ newuser \- adding a new user
 .SH SYNOPSIS
 .B /sys/lib/newuser
 .SH DESCRIPTION
-To establish a new user on Plan 9,
-add the user's name to
+To establish a new user on Plan 9, add the user to
 .B /adm/users
 by running the
-.B newuser
+.I uname
 command on the console of the file server
 (see
 .IR users (6)
 and
-.IR fs (8)).
-Next, give the user a password using the
-.B changeuser
-command on the console of the authentication server
-(see
+.IR fossilcons (4)).
+Next, give the user a password using
+.I auth/changeuser
+on the console of the authentication server (see
 .IR auth (8)).
 At this point, the user can bootstrap a terminal using the new name and
 password.
@@ -41,8 +39,11 @@ type
 .EE
 .PP
 to build the necessary directories in
-.B /usr/$user
-and create a reasonable initial profile in
+.BR /usr/$user ,
+create
+.BR /mail/box/$user/mbox ,
+.BR /cron/$user/cron ,
+a reasonable initial profile in
 .BR /usr/$user/lib/profile
 and
 plumbing rules in
@@ -80,6 +81,7 @@ case terminal
 case cpu
 	if (test -e /mnt/term/mnt/wsys) {
 		# rio already running
+		wsys = /mnt/term^`{cat /mnt/term/env/wsys}
 		bind -a /mnt/term/mnt/wsys /dev
 		echo -n $sysname > /dev/label
 	}
@@ -93,6 +95,8 @@ case cpu
 	if (! test -e /mnt/term/mnt/wsys) {
 		# cpu call from drawterm
 		font=/lib/font/bit/pelm/latin1.8.font
+		auth/factotum
+		plumber
 		exec rio
 	}
 case con
@@ -104,16 +108,11 @@ case con
 Sites may make changes to
 .B /sys/lib/newuser
 that reflect the properties of the local environment.
-.PP
-Use the
-.B -c
-option of
-.IR mail (1)
-to create a mailbox.
 .SH "SEE ALSO"
 .IR passwd (1),
 .IR rio (1),
 .IR namespace (4),
+.IR fossil (4),
 .IR users (6),
 .IR auth (8),
-.IR fs (8)
+.IR fossilcons (8).

+ 7 - 1
sys/src/9/pc/ether8390.c

@@ -260,6 +260,7 @@ dp8390write(Dp8390* ctlr, ulong to, void* from, ulong len)
 	uchar cr;
 	int timo, width;
 
+top:
 	/*
 	 * Write some data to offset 'to' in the card's memory
 	 * using the DP8390 remote DMA facility, reading it at
@@ -290,7 +291,12 @@ dp8390write(Dp8390* ctlr, ulong to, void* from, ulong len)
 		regw(ctlr, Rsar1, (crda>>8) & 0xFF);
 		regw(ctlr, Cr, Page0|RdREAD|Sta);
 	
-		for(;;){
+		for(timo=0;; timo++){
+			if(timo > 10000){
+				print("ether8390: dummyrr timeout; assuming nodummyrr\n");
+				ctlr->dummyrr = 0;
+				goto top;
+			}
 			crda = regr(ctlr, Crda0);
 			crda |= regr(ctlr, Crda1)<<8;
 			if(crda == to){

+ 1 - 0
sys/src/9/pc/pcflop

@@ -58,6 +58,7 @@ link
 	ethermedium
 	pcmciamodem
 	netdevmedium
+	loopbackmedium
 #	usbuhci
 
 misc

+ 5 - 4
sys/src/9/pc/sdata.c

@@ -1249,11 +1249,12 @@ atapktio(Drive* drive, uchar* cmd, int clen)
 	if((drive->info[Iconfig] & Mdrq) != 0x0020){
 		microdelay(1);
 		as = ataready(cmdport, ctlport, 0, Bsy, Drq|Chk, 4*1000);
-		if(as < 0)
+		if(as < 0 || (as & (Bsy|Chk))){
+			drive->status = as<0 ? 0 : as;
+			ctlr->curdrive = nil;
+			ctlr->done = 1;
 			r = SDtimeout;
-		else if(as & Chk)
-			r = SDcheck;
-		else
+		}else
 			atapktinterrupt(drive);
 	}
 	iunlock(ctlr);

+ 1 - 1
sys/src/boot/pc/ether.c

@@ -40,7 +40,7 @@ struct {
 	{ "3C589", ether589reset, 1, },
 	{ "3C562", ether589reset, 1, },
 	{ "589E", ether589reset, 1, },
-	{ "NE2000", ne2000reset, 1, },
+	{ "NE2000", ne2000reset, 0, },
 	{ "WD8003", wd8003reset, 1, },
 	{ "EC2T", ec2treset, 0, },
 	{ "AMD79C970", amd79c970reset, 0, },

+ 7 - 1
sys/src/boot/pc/ether8390.c

@@ -257,6 +257,7 @@ dp8390write(Dp8390* ctlr, ulong to, void* from, ulong len)
 	uchar cr;
 	int timo, width;
 
+top:
 	/*
 	 * Write some data to offset 'to' in the card's memory
 	 * using the DP8390 remote DMA facility, reading it at
@@ -287,7 +288,12 @@ dp8390write(Dp8390* ctlr, ulong to, void* from, ulong len)
 		regw(ctlr, Rsar1, (crda>>8) & 0xFF);
 		regw(ctlr, Cr, Page0|RdREAD|Sta);
 	
-		for(;;){
+		for(timo=0;; timo++){
+			if(timo > 10000){
+				print("ether8390: dummyrr timeout; assuming nodummyrr\n");
+				ctlr->dummyrr = 0;
+				goto top;
+			}
 			crda = regr(ctlr, Crda0);
 			crda |= regr(ctlr, Crda1)<<8;
 			if(crda == to){

+ 5 - 4
sys/src/boot/pc/sdata.c

@@ -902,11 +902,12 @@ atapktio(Drive* drive, uchar* cmd, int clen)
 	if((drive->info[Iconfig] & 0x0060) != 0x0020){
 		microdelay(1);
 		as = ataready(cmdport, ctlport, 0, Bsy, Drq|Chk, 4*1000);
-		if(as < 0)
+		if(as < 0 || (as & (Bsy|Chk))){
+			drive->status = as<0 ? 0 : as;
+			ctlr->curdrive = nil;
+			ctlr->done = 1;
 			r = SDtimeout;
-		else if(as & Chk)
-			r = SDcheck;
-		else
+		}else
 			atapktinterrupt(drive);
 	}
 	iunlock(ctlr);

+ 2 - 0
sys/src/cmd/winwatch.c

@@ -243,6 +243,8 @@ main(int argc, char **argv)
 	case 'f':
 		fontname = EARGF(usage());
 		break;
+	default:
+		usage();
 	}ARGEND
 
 	if(argc)