svn commit: r260680 - in stable/10: release usr.sbin/bsdinstall/scripts

[Devin Teske]

Author: dteske
Date: Wed Jan 15 08:10:41 2014
New Revision: 260680
URL: http://svnweb.freebsd.org/changeset/base/260680

Log:
  MFC r259686:
  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).
  
  Discussed with:	nwhitehorn

Modified:
  stable/10/release/rc.local
  stable/10/usr.sbin/bsdinstall/scripts/auto
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/release/rc.local
==============================================================================
--- stable/10/release/rc.local	Wed Jan 15 08:03:01 2014	(r260679)
+++ stable/10/release/rc.local	Wed Jan 15 08:10:41 2014	(r260680)
@@ -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: stable/10/usr.sbin/bsdinstall/scripts/auto
==============================================================================
--- stable/10/usr.sbin/bsdinstall/scripts/auto	Wed Jan 15 08:03:01 2014	(r260679)
+++ stable/10/usr.sbin/bsdinstall/scripts/auto	Wed Jan 15 08:10:41 2014	(r260680)
@@ -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