X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Fshutdown.c;h=1abc140e7d348ec6b854675b51d01e9ae006cea6;hb=de292aa1dd1942e151ff034fcb88504a86742f97;hp=8420a6753552ae7302566fcc0bab3c9df115a53e;hpb=99f098257f5e4135609edc3df965ebf27975df18;p=elogind.git diff --git a/src/core/shutdown.c b/src/core/shutdown.c index 8420a6753..1abc140e7 100644 --- a/src/core/shutdown.c +++ b/src/core/shutdown.c @@ -35,6 +35,7 @@ #include #include #include +#include #include "missing.h" #include "log.h" @@ -50,6 +51,86 @@ #define FINALIZE_ATTEMPTS 50 +static char* arg_verb; + +static int parse_argv(int argc, char *argv[]) { + enum { + ARG_LOG_LEVEL = 0x100, + ARG_LOG_TARGET, + ARG_LOG_COLOR, + ARG_LOG_LOCATION, + }; + + static const struct option options[] = { + { "log-level", required_argument, NULL, ARG_LOG_LEVEL }, + { "log-target", required_argument, NULL, ARG_LOG_TARGET }, + { "log-color", optional_argument, NULL, ARG_LOG_COLOR }, + { "log-location", optional_argument, NULL, ARG_LOG_LOCATION }, + {} + }; + + int c, r; + + assert(argc >= 1); + assert(argv); + + while ((c = getopt_long(argc, argv, "", options, NULL)) >= 0) + switch (c) { + + case ARG_LOG_LEVEL: + r = log_set_max_level_from_string(optarg); + if (r < 0) + log_error("Failed to parse log level %s, ignoring.", optarg); + + break; + + case ARG_LOG_TARGET: + r = log_set_target_from_string(optarg); + if (r < 0) + log_error("Failed to parse log target %s, ignoring", optarg); + + break; + + case ARG_LOG_COLOR: + + if (optarg) { + r = log_show_color_from_string(optarg); + if (r < 0) + log_error("Failed to parse log color setting %s, ignoring", optarg); + } else + log_show_color(true); + + break; + + case ARG_LOG_LOCATION: + if (optarg) { + r = log_show_location_from_string(optarg); + if (r < 0) + log_error("Failed to parse log location setting %s, ignoring", optarg); + } else + log_show_location(true); + + break; + + case '?': + return -EINVAL; + + default: + assert_not_reached("Unhandled option code."); + } + + if (optind >= argc) { + log_error("Verb argument missing."); + return -EINVAL; + } + + arg_verb = argv[optind]; + + if (optind + 1 < argc) + log_error("Excess arguments, ignoring"); + return 0; +} + static int prepare_new_root(void) { static const char dirs[] = "/run/initramfs/oldroot\0" @@ -132,59 +213,43 @@ static int pivot_to_new_root(void) { } int main(int argc, char *argv[]) { - bool need_umount = true, need_swapoff = true, need_loop_detach = true, need_dm_detach = true; + bool need_umount, need_swapoff, need_loop_detach, need_dm_detach; bool in_container, use_watchdog = false; - _cleanup_free_ char *line = NULL, *cgroup = NULL; + _cleanup_free_ char *cgroup = NULL; char *arguments[3]; unsigned retries; int cmd, r; - /* suppress shutdown status output if 'quiet' is used */ - r = proc_cmdline(&line); - if (r > 0) { - char *w, *state; - size_t l; + log_parse_environment(); + r = parse_argv(argc, argv); + if (r < 0) + goto error; - FOREACH_WORD_QUOTED(w, l, line, state) { - if (l == 5 && memcmp(w, "quiet", 5) == 0) { - log_set_max_level(LOG_WARNING); - break; - } - } - } + /* journald will die if not gone yet. The log target defaults + * to console, but may have been changed by commandline options. */ - log_parse_environment(); - log_set_target(LOG_TARGET_CONSOLE); /* syslog will die if not gone yet */ log_close_console(); /* force reopen of /dev/console */ log_open(); umask(0022); if (getpid() != 1) { - log_error("Not executed by init (pid 1)."); + log_error("Not executed by init (PID 1)."); r = -EPERM; goto error; } - if (argc != 2) { - log_error("Invalid number of arguments."); - r = -EINVAL; - goto error; - } - - in_container = detect_container(NULL) > 0; - - if (streq(argv[1], "reboot")) + if (streq(arg_verb, "reboot")) cmd = RB_AUTOBOOT; - else if (streq(argv[1], "poweroff")) + else if (streq(arg_verb, "poweroff")) cmd = RB_POWER_OFF; - else if (streq(argv[1], "halt")) + else if (streq(arg_verb, "halt")) cmd = RB_HALT_SYSTEM; - else if (streq(argv[1], "kexec")) + else if (streq(arg_verb, "kexec")) cmd = LINUX_REBOOT_CMD_KEXEC; else { - log_error("Unknown action '%s'.", argv[1]); r = -EINVAL; + log_error("Unknown action '%s'.", arg_verb); goto error; } @@ -201,11 +266,12 @@ int main(int argc, char *argv[]) { log_info("Sending SIGKILL to remaining processes..."); broadcast_signal(SIGKILL, true, false); - if (in_container) { - need_swapoff = false; - need_dm_detach = false; - need_loop_detach = false; - } + in_container = detect_container(NULL) > 0; + + need_umount = true; + need_swapoff = !in_container; + need_loop_detach = !in_container; + need_dm_detach = !in_container; /* Unmount all mountpoints, swaps, and loopback devices */ for (retries = 0; retries < FINALIZE_ATTEMPTS; retries++) { @@ -273,42 +339,58 @@ int main(int argc, char *argv[]) { if (retries > 0) log_info("All filesystems, swaps, loop devices, DM devices detached."); /* Yay, done */ - break; + goto initrd_jump; } /* If in this iteration we didn't manage to * unmount/deactivate anything, we simply give up */ if (!changed) { - log_error("Cannot finalize remaining file systems and devices, giving up."); - break; + log_info("Cannot finalize remaining%s%s%s%s continuing.", + need_umount ? " file systems," : "", + need_swapoff ? " swap devices," : "", + need_loop_detach ? " loop devices," : "", + need_dm_detach ? " DM devices," : ""); + goto initrd_jump; } - log_debug("Couldn't finalize remaining file systems and devices after %u retries, trying again.", retries+1); + log_debug("After %u retries, couldn't finalize remaining %s%s%s%s trying again.", + retries + 1, + need_umount ? " file systems," : "", + need_swapoff ? " swap devices," : "", + need_loop_detach ? " loop devices," : "", + need_dm_detach ? " DM devices," : ""); } - if (retries >= FINALIZE_ATTEMPTS) - log_error("Too many iterations, giving up."); - else - log_info("Storage is finalized."); + log_error("Too many iterations, giving up."); + + initrd_jump: arguments[0] = NULL; - arguments[1] = argv[1]; + arguments[1] = arg_verb; arguments[2] = NULL; - execute_directory(SYSTEM_SHUTDOWN_PATH, NULL, arguments); + execute_directory(SYSTEM_SHUTDOWN_PATH, NULL, DEFAULT_TIMEOUT_USEC, arguments); if (!in_container && !in_initrd() && access("/run/initramfs/shutdown", X_OK) == 0) { if (prepare_new_root() >= 0 && pivot_to_new_root() >= 0) { + arguments[0] = (char*) "/shutdown"; log_info("Returning to initrd..."); - execv("/shutdown", argv); + execv("/shutdown", arguments); log_error("Failed to execute shutdown binary: %m"); } } + if (need_umount || need_swapoff || need_loop_detach || need_dm_detach) + log_error("Failed to finalize %s%s%s%s ignoring", + need_umount ? " file systems," : "", + need_swapoff ? " swap devices," : "", + need_loop_detach ? " loop devices," : "", + need_dm_detach ? " DM devices," : ""); + /* The kernel will automaticall flush ATA disks and suchlike * on reboot(), but the file systems need to be synce'd * explicitly in advance. So let's do this here, but not @@ -389,5 +471,4 @@ int main(int argc, char *argv[]) { log_error("Critical error while doing system shutdown: %s", strerror(-r)); freeze(); - return EXIT_FAILURE; }