From owner-svn-src-head@FreeBSD.ORG  Tue Aug 26 09:37:44 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 027394CE;
 Tue, 26 Aug 2014 09:37:44 +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 E22E1300D;
 Tue, 26 Aug 2014 09:37:43 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s7Q9bhFJ080474;
 Tue, 26 Aug 2014 09:37:43 GMT (envelope-from se@FreeBSD.org)
Received: (from se@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s7Q9bhme080473;
 Tue, 26 Aug 2014 09:37:43 GMT (envelope-from se@FreeBSD.org)
Message-Id: <201408260937.s7Q9bhme080473@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: se set sender to se@FreeBSD.org
 using -f
From: Stefan Esser <se@FreeBSD.org>
Date: Tue, 26 Aug 2014 09:37:43 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r270652 - 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-1
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: Tue, 26 Aug 2014 09:37:44 -0000

Author: se
Date: Tue Aug 26 09:37:43 2014
New Revision: 270652
URL: http://svnweb.freebsd.org/changeset/base/270652

Log:
  Remove band.aid that made kbdcontrol lookup keymap files in the syscons
  path even under vt, which is no longer useful, since the syscons keymap
  files have been converted and committed for use by vt.

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

Modified: head/usr.sbin/kbdcontrol/kbdcontrol.c
==============================================================================
--- head/usr.sbin/kbdcontrol/kbdcontrol.c	Tue Aug 26 09:12:41 2014	(r270651)
+++ head/usr.sbin/kbdcontrol/kbdcontrol.c	Tue Aug 26 09:37:43 2014	(r270652)
@@ -800,7 +800,7 @@ load_keymap(char *opt, int dumponly)
 	char	*name, *cp;
 	char	blank[] = "", keymap_path[] = KEYMAP_PATH;
 	char	vt_keymap_path[] = VT_KEYMAP_PATH, dotkbd[] = ".kbd";
-	char	*prefix[]  = {blank, blank, blank, keymap_path, NULL};
+	char	*prefix[]  = {blank, blank, keymap_path, NULL};
 	char	*postfix[] = {blank, dotkbd, NULL};
 
 	if (is_vt4())