Plan 9 from Bell Labs 2002-12-24

dist/replica/plan9.db

@@ -2875,7 +2875,7 @@ rc/bin/leak - 775 sys sys 1032057948 1005
 rc/bin/lookman - 775 sys sys 1017679344 686
 rc/bin/lp - 775 sys sys 962679927 5357
 rc/bin/mail - 775 sys sys 1028233408 142
-rc/bin/man - 775 sys sys 1021579956 2011
+rc/bin/man - 775 sys sys 1040698721 2088
 rc/bin/map - 775 sys sys 945617207 1576
 rc/bin/mapdemo - 775 sys sys 945617207 4075
 rc/bin/membername - 775 sys sys 945617207 89
@@ -2944,7 +2944,7 @@ rc/bin/service/telcofax - 775 sys sys 945617224 93
 rc/bin/slay - 775 sys sys 1018387014 123
 rc/bin/spell - 775 sys sys 964540791 312
 rc/bin/src - 775 sys sys 1015089596 869
-rc/bin/srvssh - 775 sys sys 1039069779 2289
+rc/bin/srvssh - 775 sys sys 1040696716 2289
 rc/bin/start - 775 sys sys 945617209 120
 rc/bin/stock - 775 sys sys 1015089701 289
 rc/bin/stop - 775 sys sys 945617209 110
@@ -4401,7 +4401,7 @@ sys/man/1/comm - 664 sys sys 944959675 665
 sys/man/1/con - 664 sys sys 1022049386 4259
 sys/man/1/cp - 664 sys sys 1015024738 1390
 sys/man/1/cpp - 664 sys sys 944959674 2105
-sys/man/1/cpu - 664 sys sys 1034195345 3469
+sys/man/1/cpu - 664 sys sys 1040673168 3226
 sys/man/1/crop - 664 sys sys 984709627 2596
 sys/man/1/date - 664 sys sys 969499884 996
 sys/man/1/db - 664 sys sys 1015024738 17862
@@ -4799,7 +4799,7 @@ sys/man/8/INDEX.html - 664 sys sys 1026847121 7728
 sys/man/8/aliasmail - 664 sys sys 1026847121 1203
 sys/man/8/apm - 664 sys sys 1017679308 1811
 sys/man/8/auth - 664 sys sys 1035838620 4062
-sys/man/8/boot - 664 sys sys 1021579978 5708
+sys/man/8/boot - 664 sys sys 1040698789 6482
 sys/man/8/booting - 664 sys sys 1015024984 4136
 sys/man/8/checkarenas - 664 sys sys 1019866709 669
 sys/man/8/cpurc - 664 sys sys 971455510 1275
@@ -4826,7 +4826,7 @@ sys/man/8/newuser - 664 sys sys 954305551 2343
 sys/man/8/nfsserver - 664 sys sys 1017251291 3397
 sys/man/8/pcmcia - 664 sys sys 944959679 408
 sys/man/8/ping - 664 sys sys 1028233565 2789
-sys/man/8/plan9.ini - 664 sys sys 1021579978 20464
+sys/man/8/plan9.ini - 664 sys sys 1040698791 20588
 sys/man/8/pop3 - 664 sys sys 1037397443 2444
 sys/man/8/ppp - 664 sys sys 1032058843 4344
 sys/man/8/prep - 664 sys sys 1018802868 12910
@@ -9930,7 +9930,7 @@ sys/src/cmd/unix/drawterm/bin - 20000000775 sys sys 959090509 0
 sys/src/cmd/unix/drawterm/bin/drawterm-freebsd.gz - 775 sys sys 1022046828 259893
 sys/src/cmd/unix/drawterm/bin/drawterm-linux - 775 sys sys 1020313487 875368
 sys/src/cmd/unix/drawterm/bin/drawterm-macosx.gz - 775 sys sys 1022046829 330048
-sys/src/cmd/unix/drawterm/bin/drawterm-win.exe - 775 sys sys 1015702551 336384
+sys/src/cmd/unix/drawterm/bin/drawterm-win.exe - 775 sys sys 1040673060 307270
 sys/src/cmd/unix/drawterm/canlock-power-gcc.c - 664 sys sys 1019839861 985
 sys/src/cmd/unix/drawterm/canlock-x86-gcc.c - 664 sys sys 1020313486 308
 sys/src/cmd/unix/drawterm/canlock.c - 644 sys sys 954098604 92
@@ -9959,7 +9959,7 @@ sys/src/cmd/unix/drawterm/devunixfs.c - 664 sys sys 954098616 9548
 sys/src/cmd/unix/drawterm/dial.c - 664 sys sys 954098617 3640
 sys/src/cmd/unix/drawterm/dirfstat.c - 664 sys sys 954098617 179
 sys/src/cmd/unix/drawterm/doprint.c - 664 sys sys 954098618 11749
-sys/src/cmd/unix/drawterm/drawterm.c - 664 sys sys 1015702545 11506
+sys/src/cmd/unix/drawterm/drawterm.c - 664 sys sys 1040672905 11492
 sys/src/cmd/unix/drawterm/error.c - 664 sys sys 954098619 2515
 sys/src/cmd/unix/drawterm/error.h - 664 sys sys 954098619 3075
 sys/src/cmd/unix/drawterm/exportfs.c - 664 sys sys 964798439 13405

dist/replica/plan9.log

@@ -16816,3 +16816,10 @@
 1040522506 0 a sys/lib/postscript/troff/R.nomath - 664 sys sys 1040521371 366
 1040522506 1 a sys/lib/troff/font/devutf/R.nomath - 664 sys sys 1040521261 25129
 1040567473 0 c sys/src/fs/dev/juke.c - 664 sys sys 1040567254 22891
+1040673685 0 c sys/man/1/cpu - 664 sys sys 1040673168 3226
+1040673685 1 c sys/src/cmd/unix/drawterm/drawterm.c - 664 sys sys 1040672905 11492
+1040673685 2 c sys/src/cmd/unix/drawterm/bin/drawterm-win.exe - 775 sys sys 1040673060 307270
+1040696727 0 c rc/bin/srvssh - 775 sys sys 1040696716 2289
+1040698912 0 c rc/bin/man - 775 sys sys 1040698721 2088
+1040698912 1 c sys/man/8/boot - 664 sys sys 1040698789 6482
+1040698912 2 c sys/man/8/plan9.ini - 664 sys sys 1040698791 20588

rc/bin/man

@@ -40,6 +40,14 @@ fn roff {
 	}
 }
 
+fn page {
+	if(test -d /mnt/wsys/acme)
+		/bin/page -w
+	if not
+		/bin/page
+}
+
+
 while(~ $d 0) {
 	if(~ $#* 0) {
 		echo 'Usage: man [-ntp] [-s sec] [0-9] [0-9] ... name1 name2 ...' >[1=2]

sys/man/1/cpu

@@ -7,8 +7,6 @@ cpu \- connection to cpu server
 .B -h
 .I server
 ] [
-.B -f
-] [
 .B -a
 .I auth-method
 ] [
@@ -117,15 +115,6 @@ to older versions of the
 service.
 .PP
 The
-.B -f
-flag inserts a filter in the data stream to coalesce
-9P packet fragments into full packets.
-It is used on TCP connections, and is set automatically by
-the TCP receive script for incoming CPU calls
-(see
-.IR listen (8)).
-.PP
-The
 .B -k
 flag specifies a key pattern to use to restrict the keys
 selected by the

sys/man/8/boot

@@ -2,7 +2,7 @@
 .SH NAME
 boot \- connect to the root file server
 .SH SYNOPSIS
-.B /boot
+.B /boot/boot
 [
 .B -fkm
 ]
@@ -12,6 +12,9 @@ boot \- connect to the root file server
 [
 .IB method ! fs-addr
 ]
+[
+.I args
+]
 .SH DESCRIPTION
 .PP
 .I Boot
@@ -41,7 +44,7 @@ onto
 .B /
 and crafts an initial process whose sole function is to
 .IR exec (2)
-.BR /boot ,
+.BR /boot/boot ,
 a binary which is compiled into
 .IR root (3).
 .PP
@@ -232,16 +235,29 @@ The methods available to any system depend on what was
 compiled into the kernel.
 The complete list of booting methods are listed below.
 .TP 8
-.B il
-connect via Ethernet using the IL protocol.
-.TP 8
-.B tcp
-connect via Ethernet using the TCP protocol.
-This method is used only if the initial file server
-is on a Unix system.
+.BR il " or " tcp
+connect via Ethernet using the IL or TCP protocols.
+The
+.I args
+are passed to
+.IR ipconfig (8)
+when configuring the IP stack.
+The 
+.IR plan9.ini (8)
+variables
+.B fs
+and
+.B auth
+override the file server and authentication server IP addresses
+obtained (if any) from DHCP during
+.IR ipconfig (8).
 .TP 8
 .B local
 connect to the local file system.
+The
+.I args
+are passed to
+.IR kfs (4).
 .PP
 For the
 .B il
@@ -253,8 +269,39 @@ If no address is specified,
 a file server address will be found from another
 system on the network using the BOOTP protocol and
 the Plan 9 vendor-specific fields.
+.SH EXAMPLES
+On PCs, the default arguments to boot are constructed using
+the 
+.B bootargs
+variable in
+.IR plan9.ini (8).
+.PP
+Start 
+.IR kfs (4)
+with extra disk buffers:
+.IP
+.EX
+bootargs=local!#S/sdC0/fs -B 4096
+.EE
+.LP
+Use an IP stack on an alternate ethernet interface
+with a static address and fixed file server and authentication
+server addresses.
+.IP
+.EX
+fs=192.168.0.2
+auth=192.168.0.3
+bootargs=il -g 192.168.0.1 ether /net/ether1 \e
+    192.168.0.50 255.255.255.0
+.EE
+.LP
+(The 
+.B bootargs
+line is split only for presentation; it is one line in the file.)
 .SH FILES
 .B #s/boot
+.br
+.B #//boot/boot
 .SH SOURCE
 .B /sys/src/9/boot
 .SH "SEE ALSO"

sys/man/8/plan9.ini

@@ -492,10 +492,18 @@ These are usually used to test variant file systems for distributions, etc.
 The value of this variable is passed to
 .IR boot (8)
 by the kernel as the name of the root file system.
+It is typically used to specify additional arguments to
+pass to
+.IR kfs (4)
+or
+.IR ipconfig (8).
 For example, if the system is to run from a local
 .IR kfs (4)
 partition, the definition might read
 .BR bootargs=local!#S/sdC0/fs .
+See
+.IR boot (8)
+for more.
 .SS \fLcfs=value\fP
 This gives the name of the file holding the disk partition
 for the cache file system,

sys/src/cmd/unix/drawterm/drawterm.c

@@ -1,8 +1,8 @@
 #include "lib9.h"
 #include "auth.h"
 
-char	*cpuaddr = "anna.cs.bell-labs.com";
-char	*authaddr = "dinar.cs.bell-labs.com";
+char	*cpuaddr = "plan9cpu";
+char	*authaddr = "plan9auth";
 
 static char *pbmsg = "AS protocol botch";
 static char *ccmsg = "can't connect to AS";
@@ -74,13 +74,17 @@ main(int argc, char *argv[])
 		break;
 	case 'o':
 		/* from the outside */
+/*
 		cpuaddr = "achille.cs.bell-labs.com";
 		authaddr = "achille.cs.bell-labs.com";
+*/
 		break;
 	case '@':
 		/* from Comcast @Home */
+/*
 		cpuaddr = "10.252.0.122";
 		authaddr = "10.252.0.122";
+*/
 		break;
 	default:
 		usage();