summaryrefslogtreecommitdiff
path: root/src/locale/localed-util.c
diff options
context:
space:
mode:
authorYu Watanabe <watanabe.yu+github@gmail.com>2023-01-26 17:41:47 +0900
committerYu Watanabe <watanabe.yu+github@gmail.com>2023-01-28 14:53:18 +0900
commit71fa933b46fa1160e4c4eb037e5e9cec9c05c082 (patch)
tree6a75bec29a8904d4017721613f0a3929a744cb16 /src/locale/localed-util.c
parent800f65f827c9828d4c872d44b19ca8a008505690 (diff)
downloadsystemd-71fa933b46fa1160e4c4eb037e5e9cec9c05c082.tar.gz
locale: sync two X11 contexts on update
Diffstat (limited to 'src/locale/localed-util.c')
-rw-r--r--src/locale/localed-util.c13
1 files changed, 0 insertions, 13 deletions
diff --git a/src/locale/localed-util.c b/src/locale/localed-util.c
index 87e232e08f..2d5d76e741 100644
--- a/src/locale/localed-util.c
+++ b/src/locale/localed-util.c
@@ -329,11 +329,6 @@ int x11_read_data(Context *c, sd_bus_message *m) {
if (r < 0)
return r;
- if (!x11_context_isempty(&c->x11_from_vc)) {
- log_debug("XKB settings loaded from vconsole.conf, not reading xorg.conf.d/00-keyboard.conf.");
- return 0;
- }
-
/* Do not try to re-read the file within single bus operation. */
if (m) {
if (m == c->x11_cache)
@@ -423,9 +418,6 @@ int x11_read_data(Context *c, sd_bus_message *m) {
in_section = false;
}
- if (!x11_context_isempty(&c->x11_from_xorg))
- log_debug("XKB settings loaded from xorg.conf.d/00-keyboard.conf.");
-
return 0;
}
@@ -438,11 +430,6 @@ int vconsole_write_data(Context *c) {
xc = context_get_x11_context(c);
- /* If the X11 context is from xorg.conf, then sync one from vconsole.conf with it. */
- r = x11_context_copy(&c->x11_from_vc, xc);
- if (r < 0)
- return r;
-
r = load_env_file(NULL, "/etc/vconsole.conf", &l);
if (r < 0 && r != -ENOENT)
return r;