diff options
| author | Luca Boccassi <bluca@debian.org> | 2023-01-24 17:18:31 +0000 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2023-01-24 22:09:58 +0100 |
| commit | 1fd579061af123a74a034cf3593c0fd96d866b68 (patch) | |
| tree | 900f2f5fc0586cf2aa4df64782ccbed33f7185ee /src/locale | |
| parent | 246fd4d2ed671fd95ac514b26b4c906a6d448fa1 (diff) | |
| download | systemd-1fd579061af123a74a034cf3593c0fd96d866b68.tar.gz | |
locale: rename new XKB variables to match Debian/Ubuntu's
Debian/Ubuntu use almost the same variables, but without '_'. Given
our usage is new, rename them so that they match and downstream tech
debt can be removed.
Follow-up for https://github.com/systemd/systemd/pull/25805
See:
https://github.com/systemd/systemd/issues/24228
https://github.com/systemd/systemd/pull/25412
Diffstat (limited to 'src/locale')
| -rw-r--r-- | src/locale/localed-util.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/locale/localed-util.c b/src/locale/localed-util.c index 003663054c..e742a8d0b1 100644 --- a/src/locale/localed-util.c +++ b/src/locale/localed-util.c @@ -243,10 +243,10 @@ int vconsole_read_data(Context *c, sd_bus_message *m) { return parse_env_file_fd(fd, "/etc/vconsole.conf", "KEYMAP", &c->vc_keymap, "KEYMAP_TOGGLE", &c->vc_keymap_toggle, - "XKB_LAYOUT", &c->x11_from_vc.layout, - "XKB_MODEL", &c->x11_from_vc.model, - "XKB_VARIANT", &c->x11_from_vc.variant, - "XKB_OPTIONS", &c->x11_from_vc.options); + "XKBLAYOUT", &c->x11_from_vc.layout, + "XKBMODEL", &c->x11_from_vc.model, + "XKBVARIANT", &c->x11_from_vc.variant, + "XKBOPTIONS", &c->x11_from_vc.options); } int x11_read_data(Context *c, sd_bus_message *m) { @@ -388,19 +388,19 @@ int vconsole_write_data(Context *c) { if (r < 0) return r; - r = strv_env_assign(&l, "XKB_LAYOUT", xc ? empty_to_null(xc->layout) : NULL); + r = strv_env_assign(&l, "XKBLAYOUT", xc ? empty_to_null(xc->layout) : NULL); if (r < 0) return r; - r = strv_env_assign(&l, "XKB_MODEL", xc ? empty_to_null(xc->model) : NULL); + r = strv_env_assign(&l, "XKBMODEL", xc ? empty_to_null(xc->model) : NULL); if (r < 0) return r; - r = strv_env_assign(&l, "XKB_VARIANT", xc ? empty_to_null(xc->variant) : NULL); + r = strv_env_assign(&l, "XKBVARIANT", xc ? empty_to_null(xc->variant) : NULL); if (r < 0) return r; - r = strv_env_assign(&l, "XKB_OPTIONS", xc ? empty_to_null(xc->options) : NULL); + r = strv_env_assign(&l, "XKBOPTIONS", xc ? empty_to_null(xc->options) : NULL); if (r < 0) return r; |