Tweak startup - better display defaults, start edwood instead of acme

Also change build expect strings to regexps so it can work with different defaults in the future

Signed-off-by: Graham MacDonald <grahamamacdonald@gmail.com>

build/build-usb.bash

@@ -29,9 +29,9 @@ expect -timeout 600 "root is from (tcp, local)"
 send "local\n"
 expect -exact "mouseport is (ps2, ps2intellimouse, 0, 1, 2)\[ps2\]:"
 send "ps2intellimouse\n"
-expect -exact "vgasize \[640x480x8\]:"
+expect -re "vgasize .*:"
 send "1280x1024x32\n"
-expect -exact "monitor is \[xga\]:"
+expect -re "monitor is .*:"
 send "vesa\n"
 
 # Mount the host's fileserver

build/build.bash

@@ -29,9 +29,9 @@ expect -timeout 600 "root is from (tcp, local)"
 send "local\n"
 expect -exact "mouseport is (ps2, ps2intellimouse, 0, 1, 2)\[ps2\]:"
 send "ps2intellimouse\n"
-expect -exact "vgasize \[640x480x8\]:"
+expect -re "vgasize .*:"
 send "1280x1024x32\n"
-expect -exact "monitor is \[xga\]:"
+expect -re "monitor is .*:"
 send "vesa\n"
 
 # Mount the host's fileserver

build/command.bash

@@ -18,9 +18,9 @@ expect -timeout 600 "root is from (tcp, local)"
 send "local\n"
 expect -exact "mouseport is (ps2, ps2intellimouse, 0, 1, 2)\[ps2\]:"
 send "ps2intellimouse\n"
-expect -exact "vgasize \[640x480x8\]:"
+expect -re "vgasize .*:"
 send "1280x1024x32\n"
-expect -exact "monitor is \[xga\]:"
+expect -re "monitor is .*:"
 send "vesa\n"
 
 # Mount the host's fileserver

build/make.bash

@@ -34,9 +34,9 @@ expect -timeout 600 -exact "use DMA for ide drives\[yes\]:"
 send "\n"
 expect -exact "mouseport is (ps2, ps2intellimouse, 0, 1, 2)\[ps2\]:"
 send "ps2intellimouse\n"
-expect -exact "vgasize \[640x480x8\]:"
+expect -re "vgasize .*:"
 send "1280x1024x32\n"
-expect -exact "monitor is \[xga\]:"
+expect -re "monitor is .*:"
 send "vesa\n"
 expect -exact "% "
 send "inst/textonly\n"

rc/bin/termrc

@@ -76,16 +76,16 @@ if(~ $mouseport ask){
 		mouseport=ps2
 }
 if(~ $vgasize ask){
-	echo -n 'vgasize [640x480x8]: '
+	echo -n 'vgasize [1280x1024x32]: '
 	vgasize=`{read}
 	if(~ $#vgasize 0)
-		vgasize=640x480x8
+		vgasize=1280x1024x32
 }
 if(~ $monitor ask){
-	echo -n 'monitor is [xga]: '
+	echo -n 'monitor is [vesa]: '
 	monitor=`{read}
 	if(~ $#monitor 0)
-		monitor=xga
+		monitor=vesa
 }
 if(test -f /dev/mousectl){
 	switch($mouseport){

usr/glenda/bin/rc/riostart

@@ -13,5 +13,5 @@ if not
 	dump=acme.dump
 
 a=`{echo $wid-35 | hoc }
-window 60,90,$a,$ht acme -l lib/$dump
+window 60,90,$a,$ht edwood -l lib/$dump
 window 20,140,610,450 /usr/glenda/lib/first.window