Prep v231.2: Really set an extra wall message (if any) and display it when cancelling...

[elogind.git] / src / login / eloginctl.c

diff --git a/src/login/eloginctl.c b/src/login/eloginctl.c
index f86109dc274e6668def0b1958697e1fbbdfd0efa..e67c14f9cea7b8e43377e09790f618a8b985df50 100644 (file)
--- a/src/login/eloginctl.c
+++ b/src/login/eloginctl.c
@@ -176,6 +176,14 @@ int elogind_cancel_shutdown(sd_bus *bus) {
         _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
         int r;
 
+        r = elogind_set_wall_message(bus, NULL);
+
+        if (r < 0) {
+                log_warning_errno(r, "Failed to set wall message, ignoring: %s",
+                                  bus_error_message(&error, r));
+                sd_bus_error_free(&error);
+        }
+
         r = sd_bus_call_method(
                         bus,
                         "org.freedesktop.login1",