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
This commit is contained in:
parent
e34c3e1817
commit
895a99ef10
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=269120
@ -800,11 +800,11 @@ load_keymap(char *opt, int dumponly)
|
|||||||
char *name, *cp;
|
char *name, *cp;
|
||||||
char blank[] = "", keymap_path[] = KEYMAP_PATH;
|
char blank[] = "", keymap_path[] = KEYMAP_PATH;
|
||||||
char vt_keymap_path[] = VT_KEYMAP_PATH, dotkbd[] = ".kbd";
|
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};
|
char *postfix[] = {blank, dotkbd, NULL};
|
||||||
|
|
||||||
if (is_vt4())
|
if (is_vt4())
|
||||||
prefix[1] = vt_keymap_path;
|
prefix[2] = vt_keymap_path;
|
||||||
cp = getenv("KEYMAP_PATH");
|
cp = getenv("KEYMAP_PATH");
|
||||||
if (cp != NULL)
|
if (cp != NULL)
|
||||||
asprintf(&(prefix[0]), "%s/", cp);
|
asprintf(&(prefix[0]), "%s/", cp);
|
||||||
|
Loading…
Reference in New Issue
Block a user