]> git.ipfire.org Git - thirdparty/systemd.git/commit
localed: also report when we couldn't convert X11→console
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Mon, 23 May 2016 02:43:12 +0000 (22:43 -0400)
committerZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>
Mon, 6 Jun 2016 13:22:33 +0000 (09:22 -0400)
commit5ad327dda2b863697cf5cdc0b1724aed96c5397a
tree6c8f3ff0ad0010877bf726786fc68b1f0a8c4e29
parent6f3287b346fdcef4e1b5dd4aaeae1ee47e49e94d
localed: also report when we couldn't convert X11→console

Rework the code a bit where find_converted_keymap cannot (and should not) be
called with a null layout, so streq can be used instead of streq_ptr, etc.

Note that the behaviour of vconsole_convert_to_x11 and x11_convert_to_vconsole
is not symmetrical. When the latter cannot find a match, it simply makes the
vconsole mapping empty. But vconsole_convert_to_x11 leaves the x11 layout
unchanged. I don't know what the proper solution is here, so I'm just adding
more verbose logging without changing the logic.
src/locale/keymap-util.c
src/locale/test-keymap-util.c