X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=main.c;h=622ba631519b90811d92e8aae79d9c15acf5514f;hp=4aa63cba77310ac27fd56a2476b8703a2fab6ffc;hb=c99b188ea0f6c4b0c63aa56c439df9bab16b7924;hpb=97c4f35cd541baa2f985ff702a5b9f0b8b524a53 diff --git a/main.c b/main.c index 4aa63cba7..622ba6315 100644 --- a/main.c +++ b/main.c @@ -29,6 +29,8 @@ #include #include #include +#include +#include #include "manager.h" #include "log.h" @@ -45,7 +47,12 @@ static enum { static char *default_unit = NULL; 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; _noreturn static void freeze(void) { for (;;) @@ -59,10 +66,8 @@ _noreturn static void crash(int sig) { else { pid_t pid; - log_warning("Caugh <%s>, dumping core.", strsignal(sig)); - if ((pid = fork()) < 0) - log_error("Caught <%s>, cannot dump core: %s", strsignal(sig), strerror(errno)); + log_error("Caught <%s>, cannot fork for core dump: %s", strsignal(sig), strerror(errno)); else if (pid == 0) { struct sigaction sa; @@ -87,10 +92,42 @@ _noreturn static void crash(int sig) { assert_not_reached("We shouldn't be here..."); _exit(1); + + } else { + int status, r; + + /* Order things nicely. */ + if ((r = waitpid(pid, &status, 0)) < 0) + log_error("Caught <%s>, waitpid() failed: %s", strsignal(sig), strerror(errno)); + else if (!WCOREDUMP(status)) + log_error("Caught <%s>, core dump failed.", strsignal(sig)); + else + log_error("Caught <%s>, dumped core as pid %llu.", strsignal(sig), (unsigned long long) pid); } } - log_error("Freezing execution."); + if (crash_chvt) + chvt(crash_chvt); + + if (crash_shell) { + sigset_t mask; + + 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); + + ignore_signal(sig); + + execl("/bin/sh", "/bin/sh", NULL); + log_error("execl() failed: %s", strerror(errno)); + } + + log_info("Freezing execution."); freeze(); } @@ -103,9 +140,60 @@ static void install_crash_handler(void) { sa.sa_flags = SA_NODEFER; assert_se(sigaction(SIGSEGV, &sa, NULL) == 0); + assert_se(sigaction(SIGILL, &sa, NULL) == 0); + assert_se(sigaction(SIGFPE, &sa, NULL) == 0); + assert_se(sigaction(SIGBUS, &sa, NULL) == 0); + assert_se(sigaction(SIGQUIT, &sa, NULL) == 0); assert_se(sigaction(SIGABRT, &sa, NULL) == 0); } +static int console_setup(void) { + 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 (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(tty_fd); + + if (null_fd >= 0) + close_nointr(null_fd); + + return r; +} + static int set_default_unit(const char *u) { char *c; @@ -146,11 +234,46 @@ static int parse_proc_cmdline_word(const char *word) { if (log_set_max_level_from_string(word + 18) < 0) log_warning("Failed to parse log level %s. Ignoring.", word + 18); + } else if (startswith(word, "systemd.dump_core=")) { + int r; + + if ((r = parse_boolean(word + 18)) < 0) + log_warning("Failed to parse dump core switch %s, Ignoring.", word + 18); + else + dump_core = r; + + } else if (startswith(word, "systemd.crash_shell=")) { + int r; + + if ((r = parse_boolean(word + 20)) < 0) + log_warning("Failed to parse crash shell switch %s, Ignoring.", word + 20); + else + crash_shell = r; + + } else if (startswith(word, "systemd.crash_chvt=")) { + int k; + + if (safe_atoi(word + 19, &k) < 0) + log_warning("Failed to parse crash chvt switch %s, Ignoring.", word + 19); + else + crash_chvt = k; + + } else if (startswith(word, "systemd.")) { + + log_warning("Unknown kernel switch %s. Ignoring.", word); + + log_info("Supported kernel switches:"); + log_info("systemd.default=UNIT Default unit to start"); + log_info("systemd.log_target=console|kmsg|syslog Log target"); + log_info("systemd.log_level=LEVEL Log level"); + 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"); + } else { unsigned i; /* SysV compatibility */ - for (i = 0; i < ELEMENTSOF(rlmap); i += 2) if (streq(word, rlmap[i])) return set_default_unit(rlmap[i+1]); @@ -201,7 +324,8 @@ 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 }; static const struct option options[] = { @@ -212,6 +336,7 @@ static int parse_argv(int argc, char *argv[]) { { "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 } }; @@ -270,6 +395,10 @@ static int parse_argv(int argc, char *argv[]) { action = ACTION_DUMP_CONFIGURATION_ITEMS; break; + case ARG_CONFIRM_SPAWN: + confirm_spawn = true; + break; + case 'h': action = ACTION_HELP; break; @@ -294,7 +423,8 @@ 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; @@ -324,6 +454,10 @@ int main(int argc, char *argv[]) { /* Reset all signal handlers. */ assert_se(reset_all_signal_handlers() == 0); + /* If we are init, we can block sigkill. Yay. */ + ignore_signal(SIGKILL); + ignore_signal(SIGPIPE); + /* Close all open files */ assert_se(close_all_fds(NULL, 0) == 0); @@ -355,28 +489,35 @@ 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); + } + + if (running_as == MANAGER_INIT) + console_setup(); /* Make sure D-Bus doesn't fiddle with the SIGPIPE handlers */ dbus_connection_set_change_sigpipe(FALSE); - /* Open the logging devices, if possible and necessary*/ + /* Open the logging devices, if possible and necessary */ log_open_syslog(); log_open_kmsg(); - install_crash_handler(); - assert(!"esel"); + /* Make sure we leave a core dump without panicing the + * kernel. */ + if (getpid() == 1) + install_crash_handler(); log_debug("systemd running in %s mode.", manager_running_as_to_string(running_as)); 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; } @@ -436,5 +577,8 @@ finish: dbus_shutdown(); + if (getpid() == 1) + freeze(); + return retval; }