startup/terminal: fix NDBFILE path and start rio

This commit is contained in:
Giacomo Tesio 2016-11-29 20:43:39 +01:00
parent 488106eaac
commit 9bceb6b04e
1 changed files with 17 additions and 11 deletions

View File

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