From: Ioanna Alifieraki Date: Thu, 17 Dec 2020 14:52:07 +0000 (+0000) Subject: systemctl: do not shutdown immediately on scheduled shutdown X-Git-Tag: archive/raspbian/256.4-2+rpi1^2^2^2^2^2^2^2^2^2^2~4 X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=21d9560ed7a25f11ccd1b59d58c70653dc12522e;p=systemd.git systemctl: do not shutdown immediately on scheduled shutdown When, for whatever reason, a scheduled shutdown fails to be set, systemd will proceed with immediate shutdown without allowing the user to react. This is counterintuitive because when a scheduled shutdown is issued, it means the user wants to shutdown at a specified time in the future, not immediately. This patch prevents the immediate shutdown and informs the user that no action will be taken. Fixes: #17575 Gbp-Pq: Topic debian Gbp-Pq: Name systemctl-do-not-shutdown-immediately-on-scheduled-shutdo.patch --- diff --git a/src/systemctl/systemctl-compat-halt.c b/src/systemctl/systemctl-compat-halt.c index 4f6e3048..520e794a 100644 --- a/src/systemctl/systemctl-compat-halt.c +++ b/src/systemctl/systemctl-compat-halt.c @@ -155,9 +155,11 @@ int halt_main(void) { if (arg_force == 0) { /* always try logind first */ - if (arg_when > 0) + if (arg_when > 0) { r = logind_schedule_shutdown(arg_action); - else { + if (r < 0) + return r; + } else { r = logind_check_inhibitors(arg_action); if (r < 0) return r;