X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fshutdown.c;h=a2f3b539b3023dffbfa589337c9f296eef63aa25;hp=bd4b69bbe373c2094b46866f3ffb9bd41d5f4480;hb=30923233b34e23ed1b3ffa7317f6219f695fec2f;hpb=12aad1d075a6cfa23920b977146e79d8154f2540 diff --git a/src/shutdown.c b/src/shutdown.c index bd4b69bbe..a2f3b539b 100644 --- a/src/shutdown.c +++ b/src/shutdown.c @@ -96,113 +96,107 @@ static int killall(int sign) { return n_processes; } -static int send_signal(int sign) { - sigset_t mask, oldmask; +static void wait_for_children(int n_processes, sigset_t *mask) { usec_t until; - int n_processes; - struct timespec ts; - - assert_se(sigemptyset(&mask) == 0); - assert_se(sigaddset(&mask, SIGCHLD) == 0); - if (sigprocmask(SIG_BLOCK, &mask, &oldmask) != 0) - return -errno; - - if (kill(-1, SIGSTOP) < 0) - log_warning("Failed kill(-1, SIGSTOP): %m"); - - n_processes = killall(sign); - - if (kill(-1, SIGCONT) < 0) - log_warning("Failed kill(-1, SIGCONT): %m"); - if (n_processes <= 0) - goto finish; + assert(mask); until = now(CLOCK_MONOTONIC) + TIMEOUT_USEC; for (;;) { - usec_t n = now(CLOCK_MONOTONIC); + struct timespec ts; + int k; + usec_t n; + for (;;) { pid_t pid = waitpid(-1, NULL, WNOHANG); if (pid == 0) break; - else if (pid < 0 && errno == ECHILD) { - n_processes = 0; - goto finish; - } - if (--n_processes == 0) - goto finish; + if (pid < 0 && errno == ECHILD) + return; + + if (n_processes > 0) + if (--n_processes == 0) + return; } + n = now(CLOCK_MONOTONIC); if (n >= until) - goto finish; + return; timespec_store(&ts, until - n); - if (sigtimedwait(&mask, NULL, &ts) != SIGCHLD) - log_warning("Failed: sigtimedwait did not return SIGCHLD: %m"); + + if ((k = sigtimedwait(mask, NULL, &ts)) != SIGCHLD) { + + if (k < 0 && errno != EAGAIN) { + log_error("sigtimedwait() failed: %m"); + return; + } + + if (k >= 0) + log_warning("sigtimedwait() returned unexpected signal."); + } } +} + +static void send_signal(int sign) { + sigset_t mask, oldmask; + int n_processes; + + assert_se(sigemptyset(&mask) == 0); + assert_se(sigaddset(&mask, SIGCHLD) == 0); + assert_se(sigprocmask(SIG_BLOCK, &mask, &oldmask) == 0); + + if (kill(-1, SIGSTOP) < 0 && errno != ESRCH) + log_warning("kill(-1, SIGSTOP) failed: %m"); + + n_processes = killall(sign); + + if (kill(-1, SIGCONT) < 0 && errno != ESRCH) + log_warning("kill(-1, SIGCONT) failed: %m"); + + if (n_processes <= 0) + goto finish; + + wait_for_children(n_processes, &mask); finish: sigprocmask(SIG_SETMASK, &oldmask, NULL); - - return n_processes; } -static int rescue_send_signal(int sign) { +static void ultimate_send_signal(int sign) { sigset_t mask, oldmask; - usec_t until; - struct timespec ts; int r; - sigemptyset(&mask); - sigaddset(&mask, SIGCHLD); - if (sigprocmask(SIG_BLOCK, &mask, &oldmask) != 0) - return -errno; + assert_se(sigemptyset(&mask) == 0); + assert_se(sigaddset(&mask, SIGCHLD) == 0); + assert_se(sigprocmask(SIG_BLOCK, &mask, &oldmask) == 0); - if (kill(-1, SIGSTOP) < 0) - log_warning("Failed kill(-1, SIGSTOP): %m"); + if (kill(-1, SIGSTOP) < 0 && errno != ESRCH) + log_warning("kill(-1, SIGSTOP) failed: %m"); r = kill(-1, sign); - if (r < 0) - log_warning("Failed kill(-1, %d): %m", sign); + if (r < 0 && errno != ESRCH) + log_warning("kill(-1, %s) failed: %m", signal_to_string(sign)); - if (kill(-1, SIGCONT) < 0) - log_warning("Failed kill(-1, SIGCONT): %m"); + if (kill(-1, SIGCONT) < 0 && errno != ESRCH) + log_warning("kill(-1, SIGCONT) failed: %m"); if (r < 0) goto finish; - until = now(CLOCK_MONOTONIC) + TIMEOUT_USEC; - for (;;) { - usec_t n = now(CLOCK_MONOTONIC); - for (;;) { - pid_t pid = waitpid(-1, NULL, WNOHANG); - if (pid == 0) - break; - else if (pid < 0 && errno == ECHILD) - goto finish; - } - - if (n >= until) - goto finish; - - timespec_store(&ts, until - n); - if (sigtimedwait(&mask, NULL, &ts) != SIGCHLD) - log_warning("Failed: sigtimedwait did not return SIGCHLD: %m"); - } + wait_for_children(0, &mask); finish: sigprocmask(SIG_SETMASK, &oldmask, NULL); - - return r; } int main(int argc, char *argv[]) { int cmd, r; unsigned retries; bool need_umount = true, need_swapoff = true, need_loop_detach = true, need_dm_detach = true; - bool killed_everbody = false; + bool killed_everbody = false, in_container; log_parse_environment(); log_set_target(LOG_TARGET_CONSOLE); /* syslog will die if not gone yet */ @@ -220,6 +214,8 @@ int main(int argc, char *argv[]) { goto error; } + in_container = detect_container(NULL) > 0; + if (streq(argv[1], "reboot")) cmd = RB_AUTOBOOT; else if (streq(argv[1], "poweroff")) @@ -238,29 +234,28 @@ int main(int argc, char *argv[]) { if (mlockall(MCL_CURRENT|MCL_FUTURE) != 0) log_warning("Cannot lock process memory: %m"); - log_info("Sending SIGTERM to processes"); - r = send_signal(SIGTERM); - if (r < 0) - log_warning("Cannot send SIGTERM to all process: %s", strerror(r)); + log_info("Sending SIGTERM to remaining processes..."); + send_signal(SIGTERM); - log_info("Sending SIGKILL to processes"); - r = send_signal(SIGKILL); - if (r < 0) - log_warning("Cannot send SIGKILL to all process: %s", strerror(r)); + log_info("Sending SIGKILL to remaining processes..."); + send_signal(SIGKILL); + + if (in_container) + need_swapoff = false; /* Unmount all mountpoints, swaps, and loopback devices */ for (retries = 0; retries < FINALIZE_ATTEMPTS; retries++) { bool changed = false; if (need_umount) { - log_info("Unmounting filesystems."); + log_info("Unmounting file systems."); r = umount_all(&changed); if (r == 0) need_umount = false; else if (r > 0) - log_warning("Not all filesystems unmounted, %d left.", r); + log_info("Not all file systems unmounted, %d left.", r); else - log_error("Error unmounting filesystems: %s", strerror(-r)); + log_error("Failed to unmount file systems: %s", strerror(-r)); } if (need_swapoff) { @@ -269,9 +264,9 @@ int main(int argc, char *argv[]) { if (r == 0) need_swapoff = false; else if (r > 0) - log_warning("Not all swaps are off, %d left.", r); + log_info("Not all swaps are turned off, %d left.", r); else - log_error("Error turning off swaps: %s", strerror(-r)); + log_error("Failed to turn off swaps: %s", strerror(-r)); } if (need_loop_detach) { @@ -280,9 +275,9 @@ int main(int argc, char *argv[]) { if (r == 0) need_loop_detach = false; else if (r > 0) - log_warning("Not all loop devices detached, %d left.", r); + log_info("Not all loop devices detached, %d left.", r); else - log_error("Error detaching loop devices: %s", strerror(-r)); + log_error("Failed to detach loop devices: %s", strerror(-r)); } if (need_dm_detach) { @@ -291,9 +286,9 @@ int main(int argc, char *argv[]) { if (r == 0) need_dm_detach = false; else if (r > 0) - log_warning("Not all dm devices detached, %d left.", r); + log_warning("Not all DM devices detached, %d left.", r); else - log_error("Error detaching dm devices: %s", strerror(-r)); + log_error("Failed to detach DM devices: %s", strerror(-r)); } if (!need_umount && !need_swapoff && !need_loop_detach && !need_dm_detach) @@ -308,21 +303,30 @@ int main(int argc, char *argv[]) { if (killed_everbody) { /* Hmm, we already killed everybody, * let's just give up */ - log_error("Cannot finalize all filesystems and devices, giving up."); + log_error("Cannot finalize remaining file systems and devices, giving up."); break; } - log_warning("Cannot finalize filesystems and devices, trying to kill remaining processes."); - rescue_send_signal(SIGTERM); - rescue_send_signal(SIGKILL); + log_warning("Cannot finalize remaining file systems and devices, trying to kill remaining processes."); + ultimate_send_signal(SIGTERM); + ultimate_send_signal(SIGKILL); killed_everbody = true; } - log_debug("Couldn't finalize filesystems and devices after %u retries, trying again.", retries+1); + log_debug("Couldn't finalize remaining file systems and devices after %u retries, trying again.", retries+1); } if (retries >= FINALIZE_ATTEMPTS) - log_error("Too many interations, giving up."); + log_error("Too many iterations, giving up."); + + execute_directory(SYSTEM_SHUTDOWN_PATH, NULL, NULL); + + /* If we are in a container, just exit, this will kill our + * container for good. */ + if (in_container) { + log_error("Exiting container."); + exit(0); + } sync(); @@ -337,7 +341,7 @@ int main(int argc, char *argv[]) { log_warning("kexec failed. Falling back to normal reboot."); } else { /* Child */ - const char *args[5] = { KEXEC_BINARY_PATH, "-e", "-f", "-x", NULL }; + const char *args[3] = { "/sbin/kexec", "-e", NULL }; execv(args[0], (char * const *) args); return EXIT_FAILURE; } @@ -350,7 +354,6 @@ int main(int argc, char *argv[]) { r = -errno; error: - sync(); log_error("Critical error while doing system shutdown: %s", strerror(-r)); freeze();