morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-15 00:47:10 +09:00
Code Issues Packages Projects Releases Wiki Activity

localed: print a custom message if libxkbcommon.so is unvailable

Browse Source 
Follow-up for 82c2095a5e.

> I feel like the logging here may be a bit confusing on the new path.
> Previously you did get a message that explained what was going on. Now you get
> an info message that the layout could not be compiled, and … that's all. I can
> imagine this being a confusing red herring if someone was trying to debug a
> problem and saw this message. Perhaps we should log something else instead/as
> well, on the case where libxkbcommon isn't present, to say that's what we're
> logging about and it just means we can't validate the configuration, not that
> it's definitely invalid?
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2023-03-08 18:59:14 +01:00
committed by Yu Watanabe
parent 25a45b0dd1
commit 080ecabfd7
1 changed files with 6 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/locale/localed.c
View File

@@ -613,14 +613,13 @@ static int method_set_x11_keyboard(sd_bus_message *m, void *userdata, sd_bus_err
return sd_bus_error_set(error, SD_BUS_ERROR_INVALID_ARGS, "Received invalid keyboard data");
r = verify_xkb_rmlvo(in.model, in.layout, in.variant, in.options);
if (r < 0) {
log_full_errno(r == -EOPNOTSUPP ? LOG_NOTICE : LOG_ERR, r,
"Cannot compile XKB keymap for new x11 keyboard layout ('%s' / '%s' / '%s' / '%s'): %m",
if (r == -EOPNOTSUPP)
log_notice_errno(r, "Cannot verify if new keymap is correct, libxkbcommon.so unavailable.");
else if (r < 0) {
log_error_errno(r, "Cannot compile XKB keymap for new x11 keyboard layout ('%s' / '%s' / '%s' / '%s'): %m",
strempty(in.model), strempty(in.layout), strempty(in.variant), strempty(in.options));
if (r != -EOPNOTSUPP)
return sd_bus_error_setf(error, SD_BUS_ERROR_INVALID_ARGS,
"Specified keymap cannot be compiled, refusing as invalid.");
return sd_bus_error_set(error, SD_BUS_ERROR_INVALID_ARGS,
"Specified keymap cannot be compiled, refusing as invalid.");
}
r = vconsole_read_data(c, m);