From owner-svn-src-head@FreeBSD.ORG  Sat Jul 26 12:17:26 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id DA1C6DFE;
 Sat, 26 Jul 2014 12:17:26 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id C7EA62636;
 Sat, 26 Jul 2014 12:17:26 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s6QCHQ9B088486;
 Sat, 26 Jul 2014 12:17:26 GMT (envelope-from se@svn.freebsd.org)
Received: (from se@localhost)
 by svn.freebsd.org (8.14.8/8.14.8/Submit) id s6QCHQN8088485;
 Sat, 26 Jul 2014 12:17:26 GMT (envelope-from se@svn.freebsd.org)
Message-Id: <201407261217.s6QCHQN8088485@svn.freebsd.org>
From: Stefan Esser <se@FreeBSD.org>
Date: Sat, 26 Jul 2014 12:17:26 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r269119 - head/usr.sbin/kbdcontrol
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 26 Jul 2014 12:17:26 -0000

Author: se
Date: Sat Jul 26 12:17:26 2014
New Revision: 269119
URL: http://svnweb.freebsd.org/changeset/base/269119

Log:
  Fix obvious off by one error: prefix[1] should be set to the path of the
  newcons specific keymap files, not prefix[2]. The result of this bug was
  that kbdcontrol ignored the files in the syscons keymap directory, which
  apparently still work under newcons, for most locales.
  
  MFC after:	1 week

Modified:
  head/usr.sbin/kbdcontrol/kbdcontrol.c

Modified: head/usr.sbin/kbdcontrol/kbdcontrol.c
==============================================================================
--- head/usr.sbin/kbdcontrol/kbdcontrol.c	Sat Jul 26 10:20:48 2014	(r269118)
+++ head/usr.sbin/kbdcontrol/kbdcontrol.c	Sat Jul 26 12:17:26 2014	(r269119)
@@ -804,7 +804,7 @@ load_keymap(char *opt, int dumponly)
 	char	*postfix[] = {blank, dotkbd, NULL};
 
 	if (is_vt4())
-		prefix[2] = vt_keymap_path;
+		prefix[1] = vt_keymap_path;
 	cp = getenv("KEYMAP_PATH");
 	if (cp != NULL)
 		asprintf(&(prefix[0]), "%s/", cp);