shutdown: allow to specify broadcast message when cancelling shutdown

[elogind.git] / src / shutdownd / shutdownd.c

diff --git a/src/shutdownd/shutdownd.c b/src/shutdownd/shutdownd.c
index d426d9833d79359f7c340d8ea137e620b30d5e57..c0747415fd845dd1d38438d825b29ced7c5d168b 100644 (file)
--- a/src/shutdownd/shutdownd.c
+++ b/src/shutdownd/shutdownd.c
@@ -136,6 +136,8 @@ static void warn_wall(usec_t n, struct sd_shutdown_command *c) {
                 prefix = "The system is going down for reboot at ";
         else if (c->mode == SD_SHUTDOWN_KEXEC)
                 prefix = "The system is going down for kexec reboot at ";
                 prefix = "The system is going down for reboot at ";
         else if (c->mode == SD_SHUTDOWN_KEXEC)
                 prefix = "The system is going down for kexec reboot at ";

+        else if (c->mode == SD_SHUTDOWN_NONE)
+                prefix = "The system shutdown has been cancelled at ";

         else
                 assert_not_reached("Unknown mode!");
 
         else
                 assert_not_reached("Unknown mode!");
 


@@ -354,6 +356,8 @@ int main(int argc, char *argv[]) {
 
                                 if (!scheduled(&b.command)) {
                                         log_info("Shutdown canceled.");
 
                                 if (!scheduled(&b.command)) {
                                         log_info("Shutdown canceled.");

+                                        if (b.command.warn_wall)
+                                                warn_wall(0, &b.command);

                                         break;
                                 }
 
                                         break;
                                 }