X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshutdownd%2Fshutdownd.c;h=c0747415fd845dd1d38438d825b29ced7c5d168b;hp=d426d9833d79359f7c340d8ea137e620b30d5e57;hb=dfcc5c33f42554a5293e68e7093da2403e363997;hpb=9cb48731b29f508178731b45b0643c816800c05e

diff --git a/src/shutdownd/shutdownd.c b/src/shutdownd/shutdownd.c
index d426d9833..c0747415f 100644
--- 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 ";
+        else if (c->mode == SD_SHUTDOWN_NONE)
+                prefix = "The system shutdown has been cancelled at ";
         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 (b.command.warn_wall)
+                                                warn_wall(0, &b.command);
                                         break;
                                 }