Plan 9 from Bell Labs 2007-11-03

dist/replica/_plan9.db

@@ -1,8 +1,8 @@
 386 - 20000000775 sys sys 1010957353 0
-386/9load - 775 sys sys 1193957727 337044
-386/9loaddebug - 775 sys sys 1193957738 450621
-386/9loadlite - 775 sys sys 1193957743 160348
-386/9loadlitedebug - 775 sys sys 1193957750 236164
+386/9load - 775 sys sys 1194033350 337348
+386/9loaddebug - 775 sys sys 1194033361 451023
+386/9loadlite - 775 sys sys 1194033365 160632
+386/9loadlitedebug - 775 sys sys 1194033370 236546
 386/9pc - 775 sys sys 1192646200 2054406
 386/9pc.gz - 664 sys sys 1192646200 873537
 386/9pccpu - 775 sys sys 1191889923 1749481
@@ -11,7 +11,7 @@
 386/9pcdisk.gz - 664 sys sys 1192741561 973813
 386/9pcf - 775 sys sys 1191889940 2874011
 386/9pcf.gz - 664 sys sys 1191889940 1230163
-386/9pxeload - 775 sys sys 1193957758 337052
+386/9pxeload - 775 sys sys 1194033375 337356
 386/bin - 20000000775 sys sys 1018897690 0
 386/bin/8a - 775 sys sys 1168402260 116604
 386/bin/8c - 775 sys sys 1190520740 367214
@@ -5836,7 +5836,7 @@ sys/games - 20000000775 sys sys 1117225532 0
 sys/games/lib - 20000000775 sys sys 1165337608 0
 sys/games/lib/4scores - 10000000666 sys sys 1118680448 0
 sys/games/lib/5scores - 10000000666 sys sys 1118680453 0
-sys/games/lib/fortunes - 664 sys sys 1193852802 267533
+sys/games/lib/fortunes - 664 sys sys 1194013944 267571
 sys/games/lib/mahjongg - 20000000775 sys sys 1095792278 0
 sys/games/lib/mahjongg/backgrounds - 20000000775 sys sys 1095792293 0
 sys/games/lib/mahjongg/backgrounds/default.bit - 664 sys sys 1095792293 346803
@@ -6277,9 +6277,9 @@ sys/lib/dist/pc/inst/watchfd - 775 sys sys 1127670125 362
 sys/lib/dist/pc/inst/xxx - 775 sys sys 1018469719 160
 sys/lib/dist/pc/mkfile - 664 sys sys 1168307754 2210
 sys/lib/dist/pc/multi - 20000000775 sys sys 1147022870 0
-sys/lib/dist/pc/plan9.ini - 664 sys sys 1193864577 250
+sys/lib/dist/pc/plan9.ini - 664 sys sys 1194032589 585
 sys/lib/dist/pc/plan9.ini.blank - 664 sys sys 1018469720 512
-sys/lib/dist/pc/plan9.ini.cd - 664 sys sys 1193864518 383
+sys/lib/dist/pc/plan9.ini.cd - 664 sys sys 1194032364 562
 sys/lib/dist/pc/plan9.ini.vmware - 664 sys sys 1045500078 168
 sys/lib/dist/pc/proto - 664 sys sys 1169484200 5564
 sys/lib/dist/pc/sub - 20000000775 sys sys 1063856127 0
@@ -9161,7 +9161,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 1191446356 5411
+sys/src/boot/pc/ether.c - 664 sys sys 1194025450 5440
 sys/src/boot/pc/ether2000.c - 664 sys sys 1015007950 2609
 sys/src/boot/pc/ether2114x.c - 664 sys sys 1144977462 38028
 sys/src/boot/pc/ether589.c - 664 sys sys 1144961189 4624
@@ -9197,7 +9197,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 1193167045 18213
 sys/src/boot/pc/lib.h - 664 sys sys 1190921452 2847
-sys/src/boot/pc/load.c - 664 sys sys 1193687652 9808
+sys/src/boot/pc/load.c - 664 sys sys 1194033271 10278
 sys/src/boot/pc/mbr.s - 664 sys sys 1015007953 6234
 sys/src/boot/pc/mem.h - 664 sys sys 1190921475 3437
 sys/src/boot/pc/memory.c - 664 sys sys 1019533021 10272

dist/replica/plan9.db

@@ -1,8 +1,8 @@
 386 - 20000000775 sys sys 1010957353 0
-386/9load - 775 sys sys 1193957727 337044
-386/9loaddebug - 775 sys sys 1193957738 450621
-386/9loadlite - 775 sys sys 1193957743 160348
-386/9loadlitedebug - 775 sys sys 1193957750 236164
+386/9load - 775 sys sys 1194033350 337348
+386/9loaddebug - 775 sys sys 1194033361 451023
+386/9loadlite - 775 sys sys 1194033365 160632
+386/9loadlitedebug - 775 sys sys 1194033370 236546
 386/9pc - 775 sys sys 1192646200 2054406
 386/9pc.gz - 664 sys sys 1192646200 873537
 386/9pccpu - 775 sys sys 1191889923 1749481
@@ -11,7 +11,7 @@
 386/9pcdisk.gz - 664 sys sys 1192741561 973813
 386/9pcf - 775 sys sys 1191889940 2874011
 386/9pcf.gz - 664 sys sys 1191889940 1230163
-386/9pxeload - 775 sys sys 1193957758 337052
+386/9pxeload - 775 sys sys 1194033375 337356
 386/bin - 20000000775 sys sys 1018897690 0
 386/bin/8a - 775 sys sys 1168402260 116604
 386/bin/8c - 775 sys sys 1190520740 367214
@@ -5836,7 +5836,7 @@ sys/games - 20000000775 sys sys 1117225532 0
 sys/games/lib - 20000000775 sys sys 1165337608 0
 sys/games/lib/4scores - 10000000666 sys sys 1118680448 0
 sys/games/lib/5scores - 10000000666 sys sys 1118680453 0
-sys/games/lib/fortunes - 664 sys sys 1193852802 267533
+sys/games/lib/fortunes - 664 sys sys 1194013944 267571
 sys/games/lib/mahjongg - 20000000775 sys sys 1095792278 0
 sys/games/lib/mahjongg/backgrounds - 20000000775 sys sys 1095792293 0
 sys/games/lib/mahjongg/backgrounds/default.bit - 664 sys sys 1095792293 346803
@@ -6277,9 +6277,9 @@ sys/lib/dist/pc/inst/watchfd - 775 sys sys 1127670125 362
 sys/lib/dist/pc/inst/xxx - 775 sys sys 1018469719 160
 sys/lib/dist/pc/mkfile - 664 sys sys 1168307754 2210
 sys/lib/dist/pc/multi - 20000000775 sys sys 1147022870 0
-sys/lib/dist/pc/plan9.ini - 664 sys sys 1193864577 250
+sys/lib/dist/pc/plan9.ini - 664 sys sys 1194032589 585
 sys/lib/dist/pc/plan9.ini.blank - 664 sys sys 1018469720 512
-sys/lib/dist/pc/plan9.ini.cd - 664 sys sys 1193864518 383
+sys/lib/dist/pc/plan9.ini.cd - 664 sys sys 1194032364 562
 sys/lib/dist/pc/plan9.ini.vmware - 664 sys sys 1045500078 168
 sys/lib/dist/pc/proto - 664 sys sys 1169484200 5564
 sys/lib/dist/pc/sub - 20000000775 sys sys 1063856127 0
@@ -9161,7 +9161,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 1191446356 5411
+sys/src/boot/pc/ether.c - 664 sys sys 1194025450 5440
 sys/src/boot/pc/ether2000.c - 664 sys sys 1015007950 2609
 sys/src/boot/pc/ether2114x.c - 664 sys sys 1144977462 38028
 sys/src/boot/pc/ether589.c - 664 sys sys 1144961189 4624
@@ -9197,7 +9197,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 1193167045 18213
 sys/src/boot/pc/lib.h - 664 sys sys 1190921452 2847
-sys/src/boot/pc/load.c - 664 sys sys 1193687652 9808
+sys/src/boot/pc/load.c - 664 sys sys 1194033271 10278
 sys/src/boot/pc/mbr.s - 664 sys sys 1015007953 6234
 sys/src/boot/pc/mem.h - 664 sys sys 1190921475 3437
 sys/src/boot/pc/memory.c - 664 sys sys 1019533021 10272

dist/replica/plan9.log

@@ -53258,3 +53258,15 @@
 1193958005 3 c 386/9loadlitedebug - 775 sys sys 1193957750 236164
 1193958005 4 c 386/9pxeload - 775 sys sys 1193957758 337052
 1193963405 0 c sys/src/cmd/cwfs/cw.c - 664 sys sys 1193962091 42974
+1194015603 0 c sys/games/lib/fortunes - 664 sys sys 1194013944 267571
+1194026404 0 c sys/lib/dist/pc/plan9.ini - 664 sys sys 1194025512 331
+1194026404 1 c sys/lib/dist/pc/plan9.ini.cd - 664 sys sys 1194025515 397
+1194026404 2 c sys/src/boot/pc/ether.c - 664 sys sys 1194025450 5440
+1194033604 0 c 386/9load - 775 sys sys 1194033350 337348
+1194033604 1 c 386/9loaddebug - 775 sys sys 1194033361 451023
+1194033604 2 c 386/9loadlite - 775 sys sys 1194033365 160632
+1194033604 3 c 386/9loadlitedebug - 775 sys sys 1194033370 236546
+1194033604 4 c 386/9pxeload - 775 sys sys 1194033375 337356
+1194033604 5 c sys/lib/dist/pc/plan9.ini - 664 sys sys 1194032589 585
+1194033604 6 c sys/lib/dist/pc/plan9.ini.cd - 664 sys sys 1194032364 562
+1194033604 7 c sys/src/boot/pc/load.c - 664 sys sys 1194033271 10278

sys/games/lib/fortunes

@@ -4205,3 +4205,4 @@ This resource fork intentionally left blank
 checking size of char... 1  - gnu configure
 Nobody wants to argue with Knuth – it is the equivalent of arguing against the second law of thermodynamics.  - Mick West
 Customer stickiness reduces churn making it a valuable benefit.
+SIP is the Linux of telephony. - Sape

sys/lib/dist/pc/plan9.ini

@@ -1,3 +1,9 @@
+[menu]
+menuitem=boot, Boot Plan 9
+menuitem=debug, Boot Plan 9 and debug 9load
+menudefault=debug, 10
+
+[common]
 *nomp=1
 distname=plan9
 nobootprompt=local!/boot/bzroot
@@ -7,11 +13,20 @@ mouseport=ask
 monitor=ask
 vgasize=ask
 dmamode=ask
-
+installurl=http://plan9.bell-labs.com/plan9/download/plan9.iso.bz2
 # serial console on COM1
 #console=0
-
 # disable ether and usb probing
 #*nousbprobe=1
 #*noetherprobe=1
+
+[boot]
+bootargs=local!#S/sdD0/data
+bootfile=sdD0!cdboot!9pccd.gz
 *nobiosload=1
+*noahciload=1
+
+[debug]
+bootargs=local!#S/sdD0/data
+bootfile=sdD0!cdboot!9pccd.gz
+*debugload=1

sys/lib/dist/pc/plan9.ini.cd

@@ -1,6 +1,7 @@
 [menu]
 menuitem=install, Install Plan 9 from this CD
 menuitem=cdboot, Boot Plan 9 from this CD
+menuitem=debug, Boot Plan 9 from this CD and debug 9load
 
 [common]
 *nomp=1
@@ -12,12 +13,20 @@ vgasize=ask
 dmamode=ask
 adisk=/dev/sdD0/cdboot
 cdboot=yes
-*nobiosload=1
 
 [install]
 nobootprompt=local!/boot/bzroot
 bootfile=sdD0!cdboot!9pcflop.gz
+*nobiosload=1
+*noahciload=1
 
 [cdboot]
 bootargs=local!#S/sdD0/data
 bootfile=sdD0!cdboot!9pccd.gz
+*nobiosload=1
+*noahciload=1
+
+[debug]
+bootargs=local!#S/sdD0/data
+bootfile=sdD0!cdboot!9pccd.gz
+*debugload=1

sys/src/boot/pc/ether.c

@@ -53,6 +53,7 @@ struct {
 	{ "RTL8169", rtl8169pnp, 0, },
 	{ "83815", ether83815reset, 0, },
 	{ "rhine", rhinepnp, 0, },
+	{ "vt6102", rhinepnp, 0, },
 	{ "GA620", ga620pnp, 0, },
 	{ "83820",   dp83820pnp, 0, },
 	{ "dp83820", dp83820pnp, 0, },

sys/src/boot/pc/load.c

@@ -81,6 +81,23 @@ Type types[] = {
 	},
 };
 
+static char *typenm[] = {
+	[Tnil]		"nil",
+	[Tfloppy]	"floppy",
+	[Tsd]		"sd",
+	[Tether]	"ether",
+	[Tcd]		"cd",
+	[Tbios]		"bios",
+};
+
+static char *
+typename(int type)
+{
+	if (type < 0 || type >= nelem(typenm) || typenm[type] == nil)
+		return "**gok**";
+	return typenm[type];
+}
+
 extern SDifc sdataifc;
 extern SDifc sdiahciifc;
 extern SDifc sdaoeifc;
@@ -163,6 +180,8 @@ int scsi0port;
 char *defaultpartition;
 int iniread;
 
+static int debugload;
+
 static Medium*
 parse(char *line, char **file)
 {
@@ -243,7 +262,8 @@ probe(int type, int flag, int dev)
 					return mp;
 			}
 		}
-
+		if (debugload)
+			print("probing %s...", typename(tp->type));
 		if((tp->flag & Fprobe) == 0){
 			tp->flag |= Fprobe;
 			tp->mask = (*tp->init)();
@@ -288,15 +308,6 @@ probe(int type, int flag, int dev)
 	return 0;
 }
 
-static char *typenm[] = {
-	[Tnil]		"nil",
-	[Tfloppy]	"Tfloppy",
-	[Tsd]		"Tsd",
-	[Tether]	"Tether",
-	[Tcd]		"Tcd",
-	[Tbios]		"Tbios",
-};
-
 void
 main(void)
 {
@@ -318,6 +329,7 @@ main(void)
 		panic("i'm too big\n");
 
 	readlsconf();
+	/* find and read plan9.ini, setting configuration variables */
 	for(tp = types; tp->type != Tnil; tp++){
 		if(!pxe && tp->type == Tether)
 			continue;
@@ -329,8 +341,10 @@ main(void)
 	}
 	apminit();
 
+	debugload = getconf("*debugload") != nil;
 	if((p = getconf("console")) != nil)
 		consinit(p, getconf("baud"));
+
 	devpccardlink();
 	devi82365link();
 
@@ -340,6 +354,8 @@ main(void)
 	 * have boot devices for parse.
 	 */
 	probe(Tany, Fnone, Dany);
+	if (debugload)
+		print("end disk probe\n");
 	tried = 0;
 	mode = Mauto;
 
@@ -366,10 +382,14 @@ done:
 			flag &= ~Fbootp;
 		if((mp = probe(Tany, flag, Dany)) && mp->type->type != Tfloppy)
 			boot(mp, "");
+		if (debugload)
+			print("end auto probe\n");
 	}
 
 	def[0] = 0;
 	probe(Tany, Fnone, Dany);
+	if (debugload)
+		print("end final probe\n");
 	if(p = getconf("bootdef"))
 		strcpy(def, p);