X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=main.c;h=d2721fd0996ea975a17b4a4d328fecedd21263eb;hp=b8ad590189546a83dcd3be8ab9feee22ad5a1fc8;hb=4e8e2288650780f74f90ee0c5133c1effbfdca17;hpb=c3b3c274cf7911121f84746cd80a152455f7ec97 diff --git a/main.c b/main.c index b8ad59018..d2721fd09 100644 --- a/main.c +++ b/main.c @@ -37,6 +37,7 @@ #include "mount-setup.h" #include "hostname-setup.h" #include "load-fragment.h" +#include "fdset.h" static enum { ACTION_RUN, @@ -51,26 +52,35 @@ static ManagerRunningAs running_as = _MANAGER_RUNNING_AS_INVALID; static bool dump_core = true; static bool crash_shell = false; static int crash_chvt = -1; - static bool confirm_spawn = false; +static FILE* serialization = NULL; _noreturn static void freeze(void) { for (;;) pause(); } +static void nop_handler(int sig) { +} + _noreturn static void crash(int sig) { if (!dump_core) log_error("Caught <%s>, not dumping core.", strsignal(sig)); else { + struct sigaction sa; pid_t pid; + /* We want to wait for the core process, hence let's enable SIGCHLD */ + zero(sa); + sa.sa_handler = nop_handler; + sa.sa_flags = SA_NOCLDSTOP|SA_RESTART; + assert_se(sigaction(SIGCHLD, &sa, NULL) == 0); + if ((pid = fork()) < 0) log_error("Caught <%s>, cannot fork for core dump: %s", strsignal(sig), strerror(errno)); else if (pid == 0) { - struct sigaction sa; struct rlimit rl; /* Enable default signal handler for core dump */ @@ -110,19 +120,28 @@ _noreturn static void crash(int sig) { chvt(crash_chvt); if (crash_shell) { - sigset_t mask; + struct sigaction sa; + pid_t pid; log_info("Executing crash shell in 10s..."); sleep(10); - /* Make sure the signal is not delivered inside the - * exec() */ - assert_se(sigemptyset(&mask) == 0); - assert_se(sigaddset(&mask, sig) == 0); - assert_se(sigprocmask(SIG_SETMASK, &mask, NULL) == 0); + /* Let the kernel reap children for us */ + zero(sa); + sa.sa_handler = SIG_IGN; + sa.sa_flags = SA_NOCLDSTOP|SA_NOCLDWAIT|SA_RESTART; + assert_se(sigaction(SIGCHLD, &sa, NULL) == 0); - execl("/bin/sh", "/bin/sh", NULL); - log_error("execl() failed: %s", strerror(errno)); + if ((pid = fork()) < 0) + log_error("Failed to fork off crash shell: %s", strerror(errno)); + else if (pid == 0) { + execl("/bin/sh", "/bin/sh", NULL); + + log_error("execl() failed: %s", strerror(errno)); + _exit(1); + } + + log_info("Successfully spawned crash shall as pid %llu.", (unsigned long long) pid); } log_info("Freezing execution."); @@ -145,7 +164,7 @@ static void install_crash_handler(void) { assert_se(sigaction(SIGABRT, &sa, NULL) == 0); } -static int console_setup(void) { +static int console_setup(bool do_reset) { int tty_fd = -1, null_fd = -1, r = 0; /* If we are init, we connect stdout/stderr to /dev/console @@ -169,8 +188,9 @@ static int console_setup(void) { assert(tty_fd >= 3); assert(null_fd >= 3); - if (reset_terminal(tty_fd) < 0) - log_error("Failed to reset /dev/console: %m"); + if (do_reset) + if (reset_terminal(tty_fd) < 0) + log_error("Failed to reset /dev/console: %m"); if (dup2(tty_fd, STDOUT_FILENO) < 0 || dup2(tty_fd, STDERR_FILENO) < 0 || @@ -184,10 +204,10 @@ static int console_setup(void) { finish: if (tty_fd >= 0) - close_nointr(tty_fd); + close_nointr_nofail(tty_fd); if (null_fd >= 0) - close_nointr(null_fd); + close_nointr_nofail(null_fd); return r; } @@ -248,6 +268,15 @@ static int parse_proc_cmdline_word(const char *word) { else crash_shell = r; + + } else if (startswith(word, "systemd.confirm_spawn=")) { + int r; + + if ((r = parse_boolean(word + 22)) < 0) + log_warning("Failed to parse confirm spawn switch %s, Ignoring.", word + 22); + else + confirm_spawn = r; + } else if (startswith(word, "systemd.crash_chvt=")) { int k; @@ -267,6 +296,7 @@ static int parse_proc_cmdline_word(const char *word) { log_info("systemd.dump_core=0|1 Dump core on crash"); log_info("systemd.crash_shell=0|1 On crash run shell"); log_info("systemd.crash_chvt=N Change to VT #N on crash"); + log_info("systemd.confirm_spawn=0|1 Confirm every process spawn"); } else { unsigned i; @@ -323,19 +353,21 @@ static int parse_argv(int argc, char *argv[]) { ARG_RUNNING_AS, ARG_TEST, ARG_DUMP_CONFIGURATION_ITEMS, - ARG_CONFIRM_SPAWN + ARG_CONFIRM_SPAWN, + ARG_DESERIALIZE }; static const struct option options[] = { - { "log-level", required_argument, NULL, ARG_LOG_LEVEL }, - { "log-target", required_argument, NULL, ARG_LOG_TARGET }, - { "default", required_argument, NULL, ARG_DEFAULT }, - { "running-as", required_argument, NULL, ARG_RUNNING_AS }, - { "test", no_argument, NULL, ARG_TEST }, - { "help", no_argument, NULL, 'h' }, - { "dump-configuration-items", no_argument, NULL, ARG_DUMP_CONFIGURATION_ITEMS }, - { "confirm-spawn", no_argument, NULL, ARG_CONFIRM_SPAWN }, - { NULL, 0, NULL, 0 } + { "log-level", required_argument, NULL, ARG_LOG_LEVEL }, + { "log-target", required_argument, NULL, ARG_LOG_TARGET }, + { "default", required_argument, NULL, ARG_DEFAULT }, + { "running-as", required_argument, NULL, ARG_RUNNING_AS }, + { "test", no_argument, NULL, ARG_TEST }, + { "help", no_argument, NULL, 'h' }, + { "dump-configuration-items", no_argument, NULL, ARG_DUMP_CONFIGURATION_ITEMS }, + { "confirm-spawn", no_argument, NULL, ARG_CONFIRM_SPAWN }, + { "deserialize", required_argument, NULL, ARG_DESERIALIZE }, + { NULL, 0, NULL, 0 } }; int c, r; @@ -397,6 +429,28 @@ static int parse_argv(int argc, char *argv[]) { confirm_spawn = true; break; + case ARG_DESERIALIZE: { + int fd; + FILE *f; + + if ((r = safe_atoi(optarg, &fd)) < 0 || fd < 0) { + log_error("Failed to parse deserialize option %s.", optarg); + return r; + } + + if (!(f = fdopen(fd, "r"))) { + log_error("Failed to open serialization fd: %m"); + return r; + } + + if (serialization) + fclose(serialization); + + serialization = f; + + break; + } + case 'h': action = ACTION_HELP; break; @@ -428,11 +482,67 @@ static int help(void) { return 0; } +static int prepare_reexecute(Manager *m, FILE **_f, FDSet **_fds) { + FILE *f = NULL; + FDSet *fds = NULL; + int r; + + assert(m); + assert(_f); + assert(_fds); + + if ((r = manager_open_serialization(&f)) < 0) { + log_error("Failed to create serialization faile: %s", strerror(-r)); + goto fail; + } + + if (!(fds = fdset_new())) { + r = -ENOMEM; + log_error("Failed to allocate fd set: %s", strerror(-r)); + goto fail; + } + + if ((r = manager_serialize(m, f, fds)) < 0) { + log_error("Failed to serialize state: %s", strerror(-r)); + goto fail; + } + + if (fseeko(f, 0, SEEK_SET) < 0) { + log_error("Failed to rewind serialization fd: %m"); + goto fail; + } + + if ((r = fd_cloexec(fileno(f), false)) < 0) { + log_error("Failed to disable O_CLOEXEC for serialization: %s", strerror(-r)); + goto fail; + } + + if ((r = fdset_cloexec(fds, false)) < 0) { + log_error("Failed to disable O_CLOEXEC for serialization fds: %s", strerror(-r)); + goto fail; + } + + *_f = f; + *_fds = fds; + + return 0; + +fail: + fdset_free(fds); + + if (f) + fclose(f); + + return r; +} + int main(int argc, char *argv[]) { Manager *m = NULL; Unit *target = NULL; Job *job = NULL; int r, retval = 1; + FDSet *fds = NULL; + bool reexecute = false; if (getpid() == 1) running_as = MANAGER_INIT; @@ -456,9 +566,6 @@ int main(int argc, char *argv[]) { ignore_signal(SIGKILL); ignore_signal(SIGPIPE); - /* Close all open files */ - assert_se(close_all_fds(NULL, 0) == 0); - if (running_as != MANAGER_SESSION) if (parse_proc_cmdline() < 0) goto finish; @@ -479,6 +586,17 @@ int main(int argc, char *argv[]) { assert_se(action == ACTION_RUN || action == ACTION_TEST); + /* Remember open file descriptors for later deserialization */ + if (serialization) { + if ((r = fdset_new_fill(&fds)) < 0) { + log_error("Failed to allocate fd set: %s", strerror(-r)); + goto finish; + } + + assert_se(fdset_remove(fds, fileno(serialization)) >= 0); + } else + close_all_fds(NULL, 0); + /* Set up PATH unless it is already set */ setenv("PATH", "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin", @@ -495,8 +613,10 @@ int main(int argc, char *argv[]) { umask(0); } - if (running_as == MANAGER_INIT) - console_setup(); + /* Reset the console, but only if this is really init and we + * are freshly booted */ + if (running_as == MANAGER_INIT && action == ACTION_RUN) + console_setup(getpid() == 1 && !serialization); /* Make sure D-Bus doesn't fiddle with the SIGPIPE handlers */ dbus_connection_set_change_sigpipe(FALSE); @@ -520,52 +640,81 @@ int main(int argc, char *argv[]) { goto finish; } - if ((r = manager_coldplug(m)) < 0) { - log_error("Failed to retrieve coldplug information: %s", strerror(-r)); - goto finish; + if ((r = manager_startup(m, serialization, fds)) < 0) + log_error("Failed to fully startup daemon: %s", strerror(-r)); + + if (fds) { + /* This will close all file descriptors that were opened, but + * not claimed by any unit. */ + + fdset_free(fds); + fds = NULL; } - log_debug("Activating default unit: %s", default_unit); + if (serialization) { + fclose(serialization); + serialization = NULL; + } else { + log_debug("Activating default unit: %s", default_unit); - if ((r = manager_load_unit(m, default_unit, &target)) < 0) { - log_error("Failed to load default target: %s", strerror(-r)); + if ((r = manager_load_unit(m, default_unit, NULL, &target)) < 0) { + log_error("Failed to load default target: %s", strerror(-r)); - log_info("Trying to load rescue target..."); - if ((r = manager_load_unit(m, SPECIAL_RESCUE_TARGET, &target)) < 0) { - log_error("Failed to load rescue target: %s", strerror(-r)); + log_info("Trying to load rescue target..."); + if ((r = manager_load_unit(m, SPECIAL_RESCUE_TARGET, NULL, &target)) < 0) { + log_error("Failed to load rescue target: %s", strerror(-r)); + goto finish; + } + } + + if (action == ACTION_TEST) { + printf("-> By units:\n"); + manager_dump_units(m, stdout, "\t"); + } + + if ((r = manager_add_job(m, JOB_START, target, JOB_REPLACE, false, &job)) < 0) { + log_error("Failed to start default target: %s", strerror(-r)); goto finish; } - } - if (action == ACTION_TEST) { - printf("→ By units:\n"); - manager_dump_units(m, stdout, "\t"); + if (action == ACTION_TEST) { + printf("-> By jobs:\n"); + manager_dump_jobs(m, stdout, "\t"); + retval = 0; + goto finish; + } } - if ((r = manager_add_job(m, JOB_START, target, JOB_REPLACE, false, &job)) < 0) { - log_error("Failed to start default target: %s", strerror(-r)); - goto finish; - } + for (;;) { + if ((r = manager_loop(m)) < 0) { + log_error("Failed to run mainloop: %s", strerror(-r)); + goto finish; + } - if (action == ACTION_TEST) { - printf("→ By jobs:\n"); - manager_dump_jobs(m, stdout, "\t"); + switch (m->exit_code) { - if (getpid() == 1) - pause(); + case MANAGER_EXIT: + retval = 0; + log_debug("Exit."); + goto finish; - retval = 0; - goto finish; - } + case MANAGER_RELOAD: + if ((r = manager_reload(m)) < 0) + log_error("Failed to reload: %s", strerror(-r)); + break; - if ((r = manager_loop(m)) < 0) { - log_error("Failed to run mainloop: %s", strerror(-r)); - goto finish; - } + case MANAGER_REEXECUTE: + if (prepare_reexecute(m, &serialization, &fds) < 0) + goto finish; - retval = 0; + reexecute = true; + log_debug("Reexecuting."); + goto finish; - log_debug("Exit."); + default: + assert_not_reached("Unknown exit code."); + } + } finish: if (m) @@ -575,6 +724,49 @@ finish: dbus_shutdown(); + if (reexecute) { + const char *args[11]; + unsigned i = 0; + char sfd[16]; + + assert(serialization); + assert(fds); + + args[i++] = SYSTEMD_BINARY_PATH; + + args[i++] = "--log-level"; + args[i++] = log_level_to_string(log_get_max_level()); + + args[i++] = "--log-target"; + args[i++] = log_target_to_string(log_get_target()); + + args[i++] = "--running-as"; + args[i++] = manager_running_as_to_string(running_as); + + snprintf(sfd, sizeof(sfd), "%i", fileno(serialization)); + char_array_0(sfd); + + args[i++] = "--deserialize"; + args[i++] = sfd; + + if (confirm_spawn) + args[i++] = "--confirm-spawn"; + + args[i++] = NULL; + + assert(i <= ELEMENTSOF(args)); + + execv(args[0], (char* const*) args); + + log_error("Failed to reexecute: %m"); + } + + if (serialization) + fclose(serialization); + + if (fds) + fdset_free(fds); + if (getpid() == 1) freeze();