From dfcc5c33f42554a5293e68e7093da2403e363997 Mon Sep 17 00:00:00 2001 From: Michal Sekletar Date: Mon, 30 Jul 2012 17:25:39 +0200 Subject: shutdown: allow to specify broadcast message when cancelling shutdown makes shutdown behaviour more compatible --- src/shutdownd/shutdownd.c | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'src/shutdownd') diff --git a/src/shutdownd/shutdownd.c b/src/shutdownd/shutdownd.c index d426d9833d..c0747415fd 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; } -- cgit v1.2.3-54-g00ecf