projects
/
systemd
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7bfe0a4
)
locale: fix ENOENT handling for vconsole.conf or xorg.conf
author
Yu Watanabe
<watanabe.yu+github@gmail.com>
Wed, 1 Feb 2023 18:17:06 +0000
(
03:17
+0900)
committer
Yu Watanabe
<watanabe.yu+github@gmail.com>
Wed, 1 Feb 2023 18:59:21 +0000
(
03:59
+0900)
src/locale/localed-util.c
patch
|
blob
|
history
diff --git
a/src/locale/localed-util.c
b/src/locale/localed-util.c
index a64adcd9ca45488f932a5330a21380da71048c49..3c260d86bdfe46f7922eb9a4bd95f4665105d8c9 100644
(file)
--- a/
src/locale/localed-util.c
+++ b/
src/locale/localed-util.c
@@
-291,6
+291,7
@@
int vconsole_read_data(Context *c, sd_bus_message *m) {
if (fd == -ENOENT) {
c->vc_stat = (struct stat) {};
vc_context_clear(&c->vc);
+ x11_context_clear(&c->x11_from_vc);
return 0;
}
if (fd < 0)
@@
-337,7
+338,7
@@
int x11_read_data(Context *c, sd_bus_message *m) {
fd = RET_NERRNO(open("/etc/X11/xorg.conf.d/00-keyboard.conf", O_CLOEXEC | O_PATH));
if (fd == -ENOENT) {
c->x11_stat = (struct stat) {};
-
context_clear_x11(c
);
+
x11_context_clear(&c->x11_from_xorg
);
return 0;
}
if (fd < 0)