svn commit: r259686 - in head: release usr.sbin/bsdinstall/scripts

[Devin Teske]

Author: dteske
Date: Sat Dec 21 16:43:40 2013
New Revision: 259686
URL: http://svnweb.freebsd.org/changeset/base/259686

Log:
  Move the installer's keymap solution introduced by SVN r259468. The new
  location of /etc/rc.local on the install media is more appropriate as it
  knows serial vs. non-serial and can also do the change earlier (so that
  even the initial Install dialog can benefit from the change).
  
  MFC after:	3 days

Modified:
  head/release/rc.local
  head/usr.sbin/bsdinstall/scripts/auto

Modified: head/release/rc.local
==============================================================================
--- head/release/rc.local	Sat Dec 21 16:23:31 2013	(r259685)
+++ head/release/rc.local	Sat Dec 21 16:43:40 2013	(r259686)
@@ -19,6 +19,10 @@ if [ $? -eq 0 ]; then
 		TERM=xterm
 	fi
 
+	# Don't send ESC on function-key 62/63 (left/right command key)
+	kbdcontrol -f 62 '' > /dev/null 2>&1
+	kbdcontrol -f 63 '' > /dev/null 2>&1
+
 	if [ -z "$EXTERNAL_VTY_STARTED" ]; then
 		# Init will clean these processes up if/when the system
 		# goes multiuser

Modified: head/usr.sbin/bsdinstall/scripts/auto
==============================================================================
--- head/usr.sbin/bsdinstall/scripts/auto	Sat Dec 21 16:23:31 2013	(r259685)
+++ head/usr.sbin/bsdinstall/scripts/auto	Sat Dec 21 16:43:40 2013	(r259686)
@@ -49,10 +49,6 @@ error() {
 
 ############################################################ MAIN
 
-# Don't send ESC on function-key 62/63 (left/right command key)
-f_quietly kbdcontrol -f 62 ''
-f_quietly kbdcontrol -f 63 ''
-
 f_dprintf "Began Installation at %s" "$( date )"
 
 rm -rf $BSDINSTALL_TMPETC