Fix the no job control errors.

Thanks to satu for doing the research on keyboard muxing.

1 files changed, 7 insertions, 22 deletions

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