From 5675cf5cfbd89cb6d887c5e74ca0132f933d222c Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 2 Oct 2017 16:09:24 +0200 Subject: [PATCH] logind: don's change dry-run boolean before we actually enqueue the operation Let's not affect change before the PK check. --- src/login/logind-dbus.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/login/logind-dbus.c b/src/login/logind-dbus.c index 1769f221e..699290c8a 100644 --- a/src/login/logind-dbus.c +++ b/src/login/logind-dbus.c @@ -2079,6 +2079,7 @@ static int method_schedule_shutdown(sd_bus_message *message, void *userdata, sd_ uint64_t elapse; char *type; int r; + bool dry_run = false; assert(m); assert(message); @@ -2090,7 +2091,7 @@ static int method_schedule_shutdown(sd_bus_message *message, void *userdata, sd_ if (startswith(type, "dry-")) { type += 4; - m->shutdown_dry_run = true; + dry_run = true; } if (streq(type, "poweroff")) { @@ -2134,6 +2135,8 @@ static int method_schedule_shutdown(sd_bus_message *message, void *userdata, sd_ return log_oom(); } + m->shutdown_dry_run = dry_run; + if (m->nologin_timeout_source) { r = sd_event_source_set_time(m->nologin_timeout_source, elapse); if (r < 0) -- 2.30.2