diff options
| author | se <se@FreeBSD.org> | 2014-07-26 13:14:28 +0000 |
|---|---|---|
| committer | se <se@FreeBSD.org> | 2014-07-26 13:14:28 +0000 |
| commit | 82ca7f915fed3b8f99f4ddccb88b0c249eb47a13 (patch) | |
| tree | 117d3558425379ee5e85674d6dec7ec069fb06e0 /usr.sbin/kbdcontrol/kbdcontrol.c | |
| parent | 5f9be87d80bb1caa1f17daaf45a91b7391e36765 (diff) | |
| download | FreeBSD-src-82ca7f915fed3b8f99f4ddccb88b0c249eb47a13.zip FreeBSD-src-82ca7f915fed3b8f99f4ddccb88b0c249eb47a13.tar.gz | |
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
Diffstat (limited to 'usr.sbin/kbdcontrol/kbdcontrol.c')
| -rw-r--r-- | usr.sbin/kbdcontrol/kbdcontrol.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/usr.sbin/kbdcontrol/kbdcontrol.c b/usr.sbin/kbdcontrol/kbdcontrol.c index d5ed145..241e10d 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); |
