From 9bceb6b04e06a69ab5e02965bec7af3db2595df3 Mon Sep 17 00:00:00 2001
From: Giacomo Tesio <giacomo@tesio.it>
Date: Tue, 29 Nov 2016 20:43:39 +0100
Subject: [PATCH] startup/terminal: fix NDBFILE path and start rio

---
 arch/rc/lib/startup/terminal | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/arch/rc/lib/startup/terminal b/arch/rc/lib/startup/terminal
index 98454ba..9c25956 100755
--- a/arch/rc/lib/startup/terminal
+++ b/arch/rc/lib/startup/terminal
@@ -1,7 +1,7 @@
 #!/cmd/rc
 # terminal startup
 TIMESYNCARGS=(-rLa1000000)
-NDBFILE=/lib/ndb/local
+NDBFILE=/cfg/ndb/local
 
 mntgen -s slashn && chmod 666 /srv/slashn
 
@@ -72,21 +72,24 @@ if(! ~ $terminal *vx32*){
 if(~ $mouseport ask){
 	echo -n 'mouseport is (ps2, ps2intellimouse, 0, 1, 2)[ps2]: '
 	mouseport=`{read}
-	if(~ $#mouseport 0)
-		mouseport=ps2
 }
+if(~ $#mouseport 0)
+	mouseport=ps2
+
 if(~ $vgasize ask){
-	echo -n 'vgasize [640x480x8]: '
+	echo -n 'vgasize [1024x768x8]: '
 	vgasize=`{read}
-	if(~ $#vgasize 0)
-		vgasize=640x480x8
 }
+if(~ $#vgasize 0)
+	vgasize=1024x768x8
+
 if(~ $monitor ask){
-	echo -n 'monitor is [xga]: '
+	echo -n 'monitor is [vesa]: '
 	monitor=`{read}
-	if(~ $#monitor 0)
-		monitor=xga
 }
+if(~ $#monitor 0)
+	monitor=vesa
+
 if(test -f /dev/mousectl){
 	switch($mouseport){
 	case ps2 ps2intellimouse 0 1 2
@@ -94,10 +97,13 @@ if(test -f /dev/mousectl){
 		ms &
 		# parse vgasize into fields
 		vgasize=`{echo $vgasize}
-		if(! ~ $"monitor '' && ! ~ `{cat /dev/user} none)
-			`{ hmi/realemu && hmi/vga -m $monitor -l $vgasize }
+		if(! ~ $"monitor '' && ! ~ `{cat /dev/user} none) { 
+			hmi/realemu
+			hmi/vga -m $monitor -l $vgasize
+		}
 		if(~ $accupoint 1)
 			pipefile -dr /cmd/aux/accupoint /dev/mouse
+		rio -i /lib/riostart
 	}
 }