X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=main.c;h=0aa3796e878755fe3bce4df60f508c8d69fe9870;hp=9323d45f739fd62240b599dc184d608d6f6ccb3f;hb=2146621ba3812a78e2f0f589776f1bc4cce07d34;hpb=5373d6020426671680704d2f573f82c1659852da diff --git a/main.c b/main.c index 9323d45f7..0aa3796e8 100644 --- a/main.c +++ b/main.c @@ -30,12 +30,14 @@ #include #include #include +#include #include "manager.h" #include "log.h" #include "mount-setup.h" #include "hostname-setup.h" #include "load-fragment.h" +#include "fdset.h" static enum { ACTION_RUN, @@ -50,24 +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 */ @@ -107,11 +120,28 @@ _noreturn static void crash(int sig) { chvt(crash_chvt); if (crash_shell) { + struct sigaction sa; + pid_t pid; + log_info("Executing crash shell in 10s..."); sleep(10); - execl("/bin/sh", "/bin/sh", NULL); - log_error("execl() failed: %s", strerror(errno)); + /* 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); + + 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."); @@ -134,6 +164,54 @@ static void install_crash_handler(void) { assert_se(sigaction(SIGABRT, &sa, NULL) == 0); } +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 + * and stdin to /dev/null and make sure we don't have a + * controlling tty. */ + + release_terminal(); + + if ((tty_fd = open_terminal("/dev/console", O_WRONLY)) < 0) { + log_error("Failed to open /dev/console: %s", strerror(-tty_fd)); + r = -tty_fd; + goto finish; + } + + if ((null_fd = open("/dev/null", O_RDONLY)) < 0) { + log_error("Failed to open /dev/null: %m"); + r = -errno; + goto finish; + } + + assert(tty_fd >= 3); + assert(null_fd >= 3); + + 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 || + dup2(null_fd, STDIN_FILENO) < 0) { + log_error("Failed to dup2() device: %m"); + r = -errno; + goto finish; + } + + r = 0; + +finish: + if (tty_fd >= 0) + close_nointr_nofail(tty_fd); + + if (null_fd >= 0) + close_nointr_nofail(null_fd); + + return r; +} + static int set_default_unit(const char *u) { char *c; @@ -190,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; @@ -209,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; @@ -264,18 +352,22 @@ static int parse_argv(int argc, char *argv[]) { ARG_DEFAULT, ARG_RUNNING_AS, ARG_TEST, - ARG_DUMP_CONFIGURATION_ITEMS + ARG_DUMP_CONFIGURATION_ITEMS, + 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 }, - { 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; @@ -333,6 +425,32 @@ static int parse_argv(int argc, char *argv[]) { action = ACTION_DUMP_CONFIGURATION_ITEMS; break; + case ARG_CONFIRM_SPAWN: + 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; @@ -357,17 +475,74 @@ static int help(void) { " --log-target=TARGET Set log target (console, syslog, kmsg)\n" " --running-as=AS Set running as (init, system, session)\n" " --test Determine startup sequence, dump it and exit\n" - " --dump-configuration-items Dump understood unit configuration items\n", + " --dump-configuration-items Dump understood unit configuration items\n" + " --confirm-spawn Ask for confirmation when spawning processes\n", __progname); 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; @@ -387,8 +562,9 @@ int main(int argc, char *argv[]) { /* Reset all signal handlers. */ assert_se(reset_all_signal_handlers() == 0); - /* Close all open files */ - assert_se(close_all_fds(NULL, 0) == 0); + /* If we are init, we can block sigkill. Yay. */ + ignore_signal(SIGKILL); + ignore_signal(SIGPIPE); if (running_as != MANAGER_SESSION) if (parse_proc_cmdline() < 0) @@ -410,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", @@ -418,11 +605,18 @@ int main(int argc, char *argv[]) { /* Move out of the way, so that we won't block unmounts */ assert_se(chdir("/") == 0); - /* Become a session leader if we aren't one yet. */ - setsid(); + if (running_as != MANAGER_SESSION) { + /* Become a session leader if we aren't one yet. */ + setsid(); - /* Disable the umask logic */ - umask(0); + /* Disable the umask logic */ + umask(0); + } + + /* Reset the console, but only if this is really init and we + * are freshly booted */ + if (running_as == MANAGER_INIT) + console_setup(getpid() == 1 && !serialization); /* Make sure D-Bus doesn't fiddle with the SIGPIPE handlers */ dbus_connection_set_change_sigpipe(FALSE); @@ -441,57 +635,86 @@ int main(int argc, char *argv[]) { if (running_as == MANAGER_INIT) hostname_setup(); - if ((r = manager_new(running_as, &m)) < 0) { + if ((r = manager_new(running_as, confirm_spawn, &m)) < 0) { log_error("Failed to allocate manager object: %s", strerror(-r)); 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, NULL, &target)) < 0) { + log_error("Failed to load default target: %s", strerror(-r)); - if ((r = manager_load_unit(m, default_unit, &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, 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"); + } - 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)); + 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) @@ -501,5 +724,51 @@ 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(); + return retval; }