picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

logind: don't propagate firmware misbehaviours to bus clients 

If for some reason we can't query the firmware state, don't propagate
that to clients, but instead log about it, and claim that
reboot-to-firmware is not available (which is the right answer, since it
is not working).

Let's log about this though, as this is certainly relevant to know, even
though not for the client.
This commit is contained in:
Lennart Poettering 2017-11-23 22:02:10 +01:00
parent 8b3c4b5757
commit 6f302ce676
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/login/logind-dbus.c
View File

@ -2397,7 +2397,7 @@ static int property_get_reboot_to_firmware_setup(
r = efi_get_reboot_to_firmware();
if (r < 0 && r != -EOPNOTSUPP)
return r;
log_warning_errno(r, "Failed to determine reboot-to-firmware state: %m");
return sd_bus_message_append(reply, "b", r > 0);
}
@ -2451,10 +2451,12 @@ static int method_can_reboot_to_firmware_setup(
assert(m);
r = efi_reboot_to_firmware_supported();
if (r == -EOPNOTSUPP)
if (r < 0) {
if (r != -EOPNOTSUPP)
log_warning_errno(errno, "Failed to determine whether reboot to firmware is supported: %m");
return sd_bus_reply_method_return(message, "s", "na");
else if (r < 0)
return r;
}
r = bus_test_polkit(message,
CAP_SYS_ADMIN,