Author: se
Date: Sat Jul 26 13:14:28 2014
New Revision: 269120
URL: http://svnweb.freebsd.org/changeset/base/269120
Log:
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
Modified:
head/usr.sbin/kbdcontrol/kbdcontrol.c
Modified: head/usr.sbin/kbdcontrol/kbdcontrol.c
==============================================================================
--- head/usr.sbin/kbdcontrol/kbdcontrol.c Sat Jul 26 12:17:26 2014
(r269119)
+++ head/usr.sbin/kbdcontrol/kbdcontrol.c Sat Jul 26 13:14:28 2014
(r269120)
@@ -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);
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
