From c0ca0204934d986a7f4e994d9ee59c820d963be3 Mon Sep 17 00:00:00 2001 From: Luca Boccassi Date: Wed, 8 Feb 2023 20:34:38 +0000 Subject: [PATCH] localectl-disable-keymap-support We no longer support old debianisms such as /etc/default/keyboard, so disable the keymap interface in localectl until a definitive solution is found. Gbp-Pq: Topic debian Gbp-Pq: Name localectl-disable-keymap-support.patch --- src/locale/localectl.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/locale/localectl.c b/src/locale/localectl.c index 32354027..c4fb1f2a 100644 --- a/src/locale/localectl.c +++ b/src/locale/localectl.c @@ -383,6 +383,10 @@ static int list_x11_keymaps(int argc, char **argv, void *userdata) { return 0; } +static int not_supported(int argc, char **argv, void *userdata) { + return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP), "Setting X11 and console keymaps is not supported in Debian."); +} + static int help(void) { _cleanup_free_ char *link = NULL; int r; @@ -397,10 +401,7 @@ static int help(void) { " status Show current locale settings\n" " set-locale LOCALE... Set system locale\n" " list-locales Show known locales\n" - " set-keymap MAP [MAP] Set console and X11 keyboard mappings\n" " list-keymaps Show known virtual console keyboard mappings\n" - " set-x11-keymap LAYOUT [MODEL [VARIANT [OPTIONS]]]\n" - " Set X11 and console keyboard mappings\n" " list-x11-keymap-models Show known X11 keyboard mapping models\n" " list-x11-keymap-layouts Show known X11 keyboard mapping layouts\n" " list-x11-keymap-variants [LAYOUT]\n" @@ -500,9 +501,9 @@ static int localectl_main(sd_bus *bus, int argc, char *argv[]) { { "status", VERB_ANY, 1, VERB_DEFAULT, show_status }, { "set-locale", 2, VERB_ANY, 0, set_locale }, { "list-locales", VERB_ANY, 1, 0, list_locales }, - { "set-keymap", 2, 3, 0, set_vconsole_keymap }, + { "set-keymap", 2, 3, 0, not_supported }, { "list-keymaps", VERB_ANY, 1, 0, list_vconsole_keymaps }, - { "set-x11-keymap", 2, 5, 0, set_x11_keymap }, + { "set-x11-keymap", 2, 5, 0, not_supported }, { "list-x11-keymap-models", VERB_ANY, 1, 0, list_x11_keymaps }, { "list-x11-keymap-layouts", VERB_ANY, 1, 0, list_x11_keymaps }, { "list-x11-keymap-variants", VERB_ANY, 2, 0, list_x11_keymaps }, -- 2.30.2