chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
udev: net_id - fix OUI handling
[elogind.git]
/
src
/
udev
/
keymap
/
keymap.c
diff --git
a/src/udev/keymap/keymap.c
b/src/udev/keymap/keymap.c
index 0db56d26ad99a7dec01587dc1b8436f399d3f7be..939407fd0bd783d22aeb34856df4d976c32aba5e 100644
(file)
--- a/
src/udev/keymap/keymap.c
+++ b/
src/udev/keymap/keymap.c
@@
-423,12
+423,13
@@
int main(int argc, char **argv)
/* Open override file if present, otherwise default file */
char keymap_path[PATH_MAX];
FILE *f;
/* Open override file if present, otherwise default file */
char keymap_path[PATH_MAX];
FILE *f;
- snprintf(keymap_path, sizeof(keymap_path), "%s%s", SYSCONFDIR "/udev/keymaps/", filearg);
+
+ snprintf(keymap_path, sizeof(keymap_path), "/etc/udev/keymaps/%s", filearg);
f = fopen(keymap_path, "re");
if (f) {
merge_table(fd, f);
} else {
f = fopen(keymap_path, "re");
if (f) {
merge_table(fd, f);
} else {
- snprintf(keymap_path, sizeof(keymap_path),
"%s%s", UDEVLIBEXECDIR "/keymaps/
", filearg);
+ snprintf(keymap_path, sizeof(keymap_path),
UDEVLIBEXECDIR "/keymaps/%s
", filearg);
f = fopen(keymap_path, "re");
if (f)
merge_table(fd, f);
f = fopen(keymap_path, "re");
if (f)
merge_table(fd, f);