From 895a99ef1044fca2f7f4d2df64fddf4ac2dc5f8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20E=C3=9Fer?= Date: Sat, 26 Jul 2014 13:14:28 +0000 Subject: [PATCH] The previous commit (r269119) introduced a regression: It removed the ability to specify the the full path name of the keymap file. Instead leave the original search order intact, but insert the path for newcons-specific fonts (if run on a system using newcons): - KEYMAP_PATH in environment - full path name - /usr/share/vt/keymaps (only if newcons is in use!) - /usr/share/syscons/keymaps (also as fall-back for newcons) MFC after: 1 week --- usr.sbin/kbdcontrol/kbdcontrol.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/usr.sbin/kbdcontrol/kbdcontrol.c b/usr.sbin/kbdcontrol/kbdcontrol.c index d5ed1458ef5d..241e10d3fcf2 100644 --- a/usr.sbin/kbdcontrol/kbdcontrol.c +++ b/usr.sbin/kbdcontrol/kbdcontrol.c @@ -800,11 +800,11 @@ 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, keymap_path, NULL}; + char *prefix[] = {blank, blank, blank, keymap_path, NULL}; char *postfix[] = {blank, dotkbd, NULL}; if (is_vt4()) - prefix[1] = vt_keymap_path; + prefix[2] = vt_keymap_path; cp = getenv("KEYMAP_PATH"); if (cp != NULL) asprintf(&(prefix[0]), "%s/", cp);