X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshutdownd.c;h=b4052d4933b94b241d5927fa41934e07abc30e68;hp=d88982453653a25a6976d180482e45b0fed55020;hb=5e62067d08d989ab98b12497a9b27a877de8515b;hpb=116205924ef498ab42df233c57e1c4357618ed8a diff --git a/src/shutdownd.c b/src/shutdownd.c index d88982453..b4052d493 100644 --- a/src/shutdownd.c +++ b/src/shutdownd.c @@ -29,11 +29,12 @@ #include #include +#include + #include "shutdownd.h" #include "log.h" #include "macro.h" #include "util.h" -#include "sd-daemon.h" #include "utmp-wtmp.h" static int read_packet(int fd, struct shutdownd_command *_c) { @@ -99,35 +100,32 @@ static int read_packet(int fd, struct shutdownd_command *_c) { return 1; } -static void warn_wall(struct shutdownd_command *c) { +static void warn_wall(usec_t n, struct shutdownd_command *c) { + char date[FORMAT_TIMESTAMP_MAX]; + const char *prefix; + char *l = NULL; assert(c); assert(c->warn_wall); - if (c->wall_message[0]) - utmp_wall(c->wall_message); + if (n >= c->elapse) + return; + + if (c->mode == 'H') + prefix = "The system is going down for system halt at "; + else if (c->mode == 'P') + prefix = "The system is going down for power-off at "; + else if (c->mode == 'r') + prefix = "The system is going down for reboot at "; + else + assert_not_reached("Unknown mode!"); + + if (asprintf(&l, "%s%s%s%s!", c->wall_message, c->wall_message[0] ? "\n" : "", + prefix, format_timestamp(date, sizeof(date), c->elapse)) < 0) + log_error("Failed to allocate wall message"); else { - char date[FORMAT_TIMESTAMP_MAX]; - const char* prefix; - char *l; - - if (c->mode == 'H') - prefix = "The system is going down for system halt at"; - else if (c->mode == 'P') - prefix = "The system is going down for power-off at"; - else if (c->mode == 'r') - prefix = "The system is going down for reboot at"; - else - assert_not_reached("Unknown mode!"); - - if (asprintf(&l, "%s %s!", - prefix, - format_timestamp(date, sizeof(date), c->elapse)) < 0) - log_error("Failed to allocate wall message"); - else { - utmp_wall(l); - free(l); - } + utmp_wall(l, NULL); + free(l); } } @@ -151,8 +149,10 @@ static usec_t when_wall(usec_t n, usec_t elapse) { left = elapse - n; for (i = 0; i < ELEMENTSOF(table); i++) - if (n + table[i].delay >= elapse) + if (n + table[i].delay >= elapse) { sub = ((left / table[i].interval) * table[i].interval); + break; + } if (i >= ELEMENTSOF(table)) sub = ((left / USEC_PER_HOUR) * USEC_PER_HOUR); @@ -173,8 +173,7 @@ int main(int argc, char *argv[]) { _FD_MAX }; - int r = 4, n_fds; - int one = 1; + int r = EXIT_FAILURE, n_fds; struct shutdownd_command c; struct pollfd pollfd[_FD_MAX]; bool exec_shutdown = false, unlink_nologin = false, failed = false; @@ -182,30 +181,28 @@ int main(int argc, char *argv[]) { if (getppid() != 1) { log_error("This program should be invoked by init only."); - return 1; + return EXIT_FAILURE; } if (argc > 1) { log_error("This program does not take arguments."); - return 1; + return EXIT_FAILURE; } - log_set_target(LOG_TARGET_SYSLOG_OR_KMSG); + log_set_target(LOG_TARGET_AUTO); log_parse_environment(); + log_open(); + + umask(0022); if ((n_fds = sd_listen_fds(true)) < 0) { log_error("Failed to read listening file descriptors from environment: %s", strerror(-r)); - return 1; + return EXIT_FAILURE; } if (n_fds != 1) { log_error("Need exactly one file descriptor."); - return 2; - } - - if (setsockopt(SD_LISTEN_FDS_START, SOL_SOCKET, SO_PASSCRED, &one, sizeof(one)) < 0) { - log_error("SO_PASSCRED failed: %m"); - return 3; + return EXIT_FAILURE; } zero(c); @@ -223,7 +220,7 @@ int main(int argc, char *argv[]) { if ((pollfd[i].fd = timerfd_create(CLOCK_REALTIME, TFD_NONBLOCK|TFD_CLOEXEC)) < 0) { log_error("timerfd_create(): %m"); - failed = false; + failed = true; } } @@ -271,7 +268,7 @@ int main(int argc, char *argv[]) { /* Warn immediately if less than 15 minutes are left */ if (n < c.elapse && n + 15*USEC_PER_MINUTE >= c.elapse) - warn_wall(&c); + warn_wall(n, &c); } /* Disallow logins 5 minutes prior to shutdown */ @@ -299,7 +296,7 @@ int main(int argc, char *argv[]) { if (pollfd[FD_WALL_TIMER].revents) { struct itimerspec its; - warn_wall(&c); + warn_wall(n, &c); flush_fd(pollfd[FD_WALL_TIMER].fd); /* Restart timer */ @@ -314,8 +311,10 @@ int main(int argc, char *argv[]) { if (pollfd[FD_NOLOGIN_TIMER].revents) { int e; - if ((e = touch("/etc/nologin")) < 0) - log_error("Failed to create /etc/nologin: %s", strerror(-e)); + log_info("Creating /run/nologin, blocking further logins..."); + + if ((e = write_one_line_file_atomic("/run/nologin", "System is going down.")) < 0) + log_error("Failed to create /run/nologin: %s", strerror(-e)); else unlink_nologin = true; @@ -329,7 +328,7 @@ int main(int argc, char *argv[]) { } while (c.elapse > 0); - r = 0; + r = EXIT_SUCCESS; log_debug("systemd-shutdownd stopped as pid %lu", (unsigned long) getpid()); @@ -339,20 +338,27 @@ finish: if (pollfd[i].fd >= 0) close_nointr_nofail(pollfd[i].fd); - if (exec_shutdown) { + if (unlink_nologin) + unlink("/run/nologin"); + + if (exec_shutdown && !c.dry_run) { char sw[3]; sw[0] = '-'; sw[1] = c.mode; sw[2] = 0; - execl(SYSTEMCTL_BINARY_PATH, "shutdown", sw, "now", NULL); + execl(SYSTEMCTL_BINARY_PATH, + "shutdown", + sw, + "now", + (c.warn_wall && c.wall_message[0]) ? c.wall_message : + (c.warn_wall ? NULL : "--no-wall"), + NULL); + log_error("Failed to execute /sbin/shutdown: %m"); } - if (unlink_nologin) - unlink("/etc/nologin"); - sd_notify(false, "STATUS=Exiting...");