[Midnightbsd-cvs] src [8946] trunk/release/rc.local: update steps and switch to xterm

[laffer1 at midnightbsd.org]

Revision: 8946
          http://svnweb.midnightbsd.org/src/?rev=8946
Author:   laffer1
Date:     2016-09-26 19:20:46 -0400 (Mon, 26 Sep 2016)
Log Message:
-----------
update steps and switch to xterm

Modified Paths:
--------------
    trunk/release/rc.local

Modified: trunk/release/rc.local
===================================================================
--- trunk/release/rc.local	2016-09-26 23:16:50 UTC (rev 8945)
+++ trunk/release/rc.local	2016-09-26 23:20:46 UTC (rev 8946)
@@ -9,10 +9,25 @@
 : ${DIALOG_ITEM_HELP=4}
 : ${DIALOG_ESC=255}
 
+MACHINE=`uname -m`
+
 kbdcontrol -d >/dev/null 2>&1
 if [ $? -eq 0 ]; then
-	# Syscons
-	TERM=cons25
+	# Syscons: use xterm, start interesting things on other VTYs
+	if [ ${MACHINE} = "pc98" ]; then
+		TERM=cons25w
+	else
+		TERM=xterm
+	fi
+
+	if [ -z "$EXTERNAL_VTY_STARTED" ]; then
+		# Init will clean these processes up if/when the system
+		# goes multiuser
+		touch /tmp/bsdinstall_log
+		tail -f /tmp/bsdinstall_log > /dev/ttyv2 &
+		/usr/libexec/getty autologin ttyv3 &
+		EXTERNAL_VTY_STARTED=1
+	fi
 else
 	# Serial or other console
 	echo
@@ -23,6 +38,7 @@
 	echo "   ansi     Standard ANSI terminal"
 	echo "   vt100    VT100 or compatible terminal"
 	echo "   xterm    xterm terminal emulator (or compatible)"
+	echo "   cons25w  cons25w terminal"
 	echo
 	echo -n "Console type [vt100]: "
 	read TERM
@@ -30,8 +46,18 @@
 fi
 export TERM
 
-dialog --backtitle "MidnightBSD Installer" --title "Welcome" --extra-button --extra-label "Shell" --ok-label "Install" --cancel-label "Live CD" --yesno "Welcome to BSD! Would you like to begin an installation or use the live CD?" 0 0
+if [ -f /etc/installerconfig ]; then
+	if bsdinstall script /etc/installerconfig; then
+		dialog --backtitle "MidnightBSD Installer" --title "Complete" --no-cancel --ok-label "Reboot" --pause "Installation of MidnightBSD complete! Rebooting in 10 seconds" 10 30 10
+		reboot
+	else
+		dialog --backtitle "MidnightBSD Installer" --title "Error" --textbox /tmp/bsdinstall_log 0 0
+	fi
+	exit 
+fi
 
+dialog --backtitle "MidnightBSD Installer" --title "Welcome" --extra-button --extra-label "Shell" --ok-label "Install" --cancel-label "Live CD" --yesno "Welcome to MidnightBSD! Would you like to begin an installation or use the live CD?" 0 0
+
 case $? in
 $DIALOG_OK)	# Install
 	# If not netbooting, have the installer configure the network
@@ -43,7 +69,7 @@
 	trap true SIGINT	# Ignore cntrl-C here
 	bsdinstall
 	if [ $? -eq 0 ]; then
-		dialog --backtitle "MidnightBSD Installer" --title "Complete" --yes-label "Reboot" --no-label "Live CD" --yesno "Installation of BSD complete! Would you like to reboot into the installed system now?" 0 0 && reboot
+		dialog --backtitle "MidnightBSD Installer" --title "Complete" --yes-label "Reboot" --no-label "Live CD" --yesno "Installation of MidnightBSD complete! Would you like to reboot into the installed system now?" 0 0 && reboot
 	else
 		. /etc/rc.local
 	fi