From b1ce7649756684cedd6f3db53ac3bc465c5fc519 Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Sun, 11 Dec 2005 22:25:54 +0000
Subject: Fix the no job control errors.

Thanks to satu for doing the research on keyboard muxing.
---
 etc/gettytab                      |  6 +++---
 etc/rc                            | 29 +++++++----------------------
 etc/ttys_wrap                     |  4 ++--
 usr/local/www/system_advanced.php |  2 ++
 4 files changed, 14 insertions(+), 27 deletions(-)

diff --git a/etc/gettytab b/etc/gettytab
index 68a3dcb..2ef083c 100644
--- a/etc/gettytab
+++ b/etc/gettytab
@@ -36,7 +36,7 @@
 #     ep:op:  same as ap.
 #
 default:\
-	:cb:ce:ck:lc:fd#1000:im=\r\n%s/%m (%h) (%t)\r\n\r\n:sp#1200:\
+	:al=root:cb:ce:ck:lc:fd#1000:im=\r\n%s/%m (%h) (%t)\r\n\r\n:sp#1200:\
 	:if=/etc/issue:
 
 #
@@ -203,7 +203,7 @@ A|Auto-baud:\
 #
 
 autologin|al.9600:\
-	:tc=std.9600:
+	:al=root:tc=std.9600:
 
 #
 # Entries for 3-wire serial terminals.  These don't supply carrier, so
@@ -218,4 +218,4 @@ autologin|al.9600:\
 3wire.115200|115200-3wire:\
 	:np:nc:sp#115200:
 3wire.230400|230400-3wire:\
-	:np:nc:sp#230400:
+	:np:nc:sp#230400:
\ No newline at end of file
diff --git a/etc/rc b/etc/rc
index e528654..e7cfb6b 100755
--- a/etc/rc
+++ b/etc/rc
@@ -171,10 +171,13 @@ if [ -f /etc/rc.conf ]; then
     rm -rf /etc/rc.conf
 fi
 
-echo -n "Starting USB... "
-/usr/sbin/usbd 2>>/tmp/bootup_messages
-/usr/local/sbin/kbdcheck
-echo "done."
+# Launching kbdmux(4)
+if [ -f "/dev/kbdmux0" ]; then
+	echo "Starting Keyboard Mux Services..."
+	kbdcontrol -k /dev/kbdmux0 < /dev/console
+	[ -c "/dev/atkbd0" ] && kbdcontrol -a atkbd0 < /dev/console
+	[ -c "/dev/ukbd0" ] && kbdcontrol -a ukbd0 < /dev/console	
+fi
 
 # let the PHP-based configuration subsystem set up the system now
 /etc/rc.bootup
@@ -205,24 +208,6 @@ rm -rf /usr/local/pkg/pf/CVS
 
 echo "Bootup complete"
 
-if [ -e /dev/ttyv1 ]; then
-    if [ ! -e /var/etc/console_lockdown ]; then
-	# Allow VTY switching
-	/usr/sbin/vidcontrol -S on 2>/dev/null
-	# Turn off bloody mouse pointer.
-	/usr/sbin/vidcontrol -m off	 2>/dev/null
-	env TERM=cons25 sh -c /etc/rc.initial 2>/dev/ttyv1 </dev/ttyv1 >/dev/ttyv1 &
-	sleep 1
-	/usr/sbin/vidcontrol -s 2 2>/dev/null
-    fi
-else
-    while [ 1 ];
-    do
-	env TERM=cons25 sh -c "/etc/rc.initial"
-    done
-    exit
-fi
-
 /usr/local/bin/beep.sh start
 
 exit 0
diff --git a/etc/ttys_wrap b/etc/ttys_wrap
index 79e1cf8..45c3956 100644
--- a/etc/ttys_wrap
+++ b/etc/ttys_wrap
@@ -30,6 +30,6 @@
 #
 # If console is marked "insecure", then init will ask for the root password
 # when going to single-user mode.
-#console    "/usr/libexec/getty Pc"         cons25  on  secure
+console    "/usr/libexec/getty Pc"         cons25  on  secure
 #
-ttyv0       "/usr/libexec/getty Pc"         cons25  off secure
+#ttyv0       "/usr/libexec/getty Pc"         cons25  on	secure
diff --git a/usr/local/www/system_advanced.php b/usr/local/www/system_advanced.php
index e616a3b..4a46351 100755
--- a/usr/local/www/system_advanced.php
+++ b/usr/local/www/system_advanced.php
@@ -152,8 +152,10 @@ if ($_POST) {
 		$config['system']['webgui']['private-key'] = base64_encode($_POST['key']);
 		if($_POST['disableconsolemenu'] == "yes") {
 			$config['system']['disableconsolemenu'] = true;
+			auto_login(true);
 		} else {
 			unset($config['system']['disableconsolemenu']);
+			auto_login(false);
 		}
 		unset($config['system']['webgui']['expanddiags']);
 		$config['system']['optimization'] = $_POST['optimization'];
-- 
cgit v1.1