X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fmain.c;h=cddfc88454f2dd14772195392efb2c60ca608f9f;hp=a2dc1bc12f707fb69581b28cfee99c8ba99d2b58;hb=0ff4cdd967246bbc44f66470c2e96b403ee77aed;hpb=487393e9f11e4a06d91df03232914bd8c4b3368e diff --git a/src/main.c b/src/main.c index a2dc1bc12..cddfc8845 100644 --- a/src/main.c +++ b/src/main.c @@ -43,6 +43,8 @@ #include "fdset.h" #include "special.h" #include "conf-parser.h" +#include "bus-errors.h" +#include "missing.h" static enum { ACTION_RUN, @@ -53,6 +55,7 @@ static enum { } arg_action = ACTION_RUN; static char *arg_default_unit = NULL; +static char *arg_console = NULL; static ManagerRunningAs arg_running_as = _MANAGER_RUNNING_AS_INVALID; static bool arg_dump_core = true; @@ -75,7 +78,7 @@ static void nop_handler(int sig) { _noreturn_ static void crash(int sig) { if (!arg_dump_core) - log_error("Caught <%s>, not dumping core.", strsignal(sig)); + log_error("Caught <%s>, not dumping core.", signal_to_string(sig)); else { struct sigaction sa; pid_t pid; @@ -87,7 +90,7 @@ _noreturn_ static void crash(int sig) { 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)); + log_error("Caught <%s>, cannot fork for core dump: %s", signal_to_string(sig), strerror(errno)); else if (pid == 0) { struct rlimit rl; @@ -117,11 +120,11 @@ _noreturn_ static void crash(int sig) { /* Order things nicely. */ if ((r = waitpid(pid, &status, 0)) < 0) - log_error("Caught <%s>, waitpid() failed: %s", strsignal(sig), strerror(errno)); + log_error("Caught <%s>, waitpid() failed: %s", signal_to_string(sig), strerror(errno)); else if (!WCOREDUMP(status)) - log_error("Caught <%s>, core dump failed.", strsignal(sig)); + log_error("Caught <%s>, core dump failed.", signal_to_string(sig)); else - log_error("Caught <%s>, dumped core as pid %lu.", strsignal(sig), (unsigned long) pid); + log_error("Caught <%s>, dumped core as pid %lu.", signal_to_string(sig), (unsigned long) pid); } } @@ -324,7 +327,26 @@ static int parse_proc_cmdline_word(const char *word) { } else if (streq(word, "nomodules")) arg_nomodules = true; - else if (streq(word, "quiet")) { + else if (startswith(word, "console=")) { + const char *k; + size_t l; + char *w = NULL; + + k = word + 8; + l = strcspn(k, ","); + + if (l < 4 || + !startswith(k, "tty") || + k[3+strspn(k+3, "0123456789")] != 0) { + + if (!(w = strndup(k, l))) + return -ENOMEM; + } + + free(arg_console); + arg_console = w; + + } else if (streq(word, "quiet")) { if (!ignore_quiet) arg_show_status = false; } else { @@ -426,7 +448,7 @@ static int config_parse_cpu_affinity( assert(lvalue); assert(rvalue); - FOREACH_WORD(w, l, rvalue, state) { + FOREACH_WORD_QUOTED(w, l, rvalue, state) { char *t; int r; unsigned cpu; @@ -544,7 +566,8 @@ static int parse_argv(int argc, char *argv[]) { ARG_LOG_COLOR, ARG_LOG_LOCATION, ARG_UNIT, - ARG_RUNNING_AS, + ARG_SYSTEM, + ARG_SESSION, ARG_TEST, ARG_DUMP_CONFIGURATION_ITEMS, ARG_DUMP_CORE, @@ -561,7 +584,8 @@ static int parse_argv(int argc, char *argv[]) { { "log-color", optional_argument, NULL, ARG_LOG_COLOR }, { "log-location", optional_argument, NULL, ARG_LOG_LOCATION }, { "unit", required_argument, NULL, ARG_UNIT }, - { "running-as", required_argument, NULL, ARG_RUNNING_AS }, + { "system", no_argument, NULL, ARG_SYSTEM }, + { "session", no_argument, NULL, ARG_SESSION }, { "test", no_argument, NULL, ARG_TEST }, { "help", no_argument, NULL, 'h' }, { "dump-configuration-items", no_argument, NULL, ARG_DUMP_CONFIGURATION_ITEMS }, @@ -579,7 +603,7 @@ static int parse_argv(int argc, char *argv[]) { assert(argc >= 1); assert(argv); - while ((c = getopt_long(argc, argv, "h", options, NULL)) >= 0) + while ((c = getopt_long(argc, argv, "hD", options, NULL)) >= 0) switch (c) { @@ -633,17 +657,13 @@ static int parse_argv(int argc, char *argv[]) { break; - case ARG_RUNNING_AS: { - ManagerRunningAs as; - - if ((as = manager_running_as_from_string(optarg)) < 0) { - log_error("Failed to parse running as value %s", optarg); - return -EINVAL; - } + case ARG_SYSTEM: + arg_running_as = MANAGER_SYSTEM; + break; - arg_running_as = as; + case ARG_SESSION: + arg_running_as = MANAGER_SESSION; break; - } case ARG_TEST: arg_action = ACTION_TEST; @@ -716,6 +736,10 @@ static int parse_argv(int argc, char *argv[]) { arg_action = ACTION_HELP; break; + case 'D': + log_set_max_level(LOG_DEBUG); + break; + case '?': return -EINVAL; @@ -745,7 +769,8 @@ static int help(void) { " --dump-configuration-items Dump understood unit configuration items\n" " --introspect[=INTERFACE] Extract D-Bus interface data\n" " --unit=UNIT Set default unit\n" - " --running-as=AS Set running as (system, session)\n" + " --system Run a system instance, even if PID != 1\n" + " --session Run a session instance\n" " --dump-core Dump core on crash\n" " --crash-shell Run shell on crash\n" " --confirm-spawn Ask for confirmation when spawning processes\n" @@ -768,7 +793,7 @@ static int prepare_reexecute(Manager *m, FILE **_f, FDSet **_fds) { assert(_f); assert(_fds); - if ((r = manager_open_serialization(&f)) < 0) { + if ((r = manager_open_serialization(m, &f)) < 0) { log_error("Failed to create serialization faile: %s", strerror(-r)); goto fail; } @@ -816,7 +841,6 @@ fail: 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; @@ -831,13 +855,16 @@ int main(int argc, char *argv[]) { return 1; } - log_show_color(true); + log_show_color(isatty(STDERR_FILENO) > 0); log_show_location(false); - log_set_max_level(LOG_DEBUG); + log_set_max_level(LOG_INFO); if (getpid() == 1) { arg_running_as = MANAGER_SYSTEM; log_set_target(LOG_TARGET_SYSLOG_OR_KMSG); + + if (label_init() < 0) + goto finish; } else { arg_running_as = MANAGER_SESSION; log_set_target(LOG_TARGET_CONSOLE); @@ -848,7 +875,7 @@ int main(int argc, char *argv[]) { /* Mount /proc, /sys and friends, so that /proc/cmdline and * /proc/$PID/fd is available. */ - if (geteuid() == 0) + if (geteuid() == 0 && !getenv("SYSTEMD_SKIP_API_MOUNTS")) if (mount_setup() < 0) goto finish; @@ -929,14 +956,26 @@ int main(int argc, char *argv[]) { if (getpid() == 1) install_crash_handler(); - log_debug(PACKAGE_STRING " running in %s mode.", manager_running_as_to_string(arg_running_as)); + log_info(PACKAGE_STRING " running in %s mode.", manager_running_as_to_string(arg_running_as)); - if (arg_running_as == MANAGER_SYSTEM && !serialization) { - status_welcome(); - modprobe_setup(arg_nomodules); - kmod_setup(); - hostname_setup(); - loopback_setup(); + if (arg_running_as == MANAGER_SYSTEM) { + + /* Disable nscd, to avoid deadlocks when systemd uses + * NSS and the nscd socket is maintained by us. */ + /* if (nss_disable_nscd) { */ + /* log_debug("Disabling nscd"); */ + /* nss_disable_nscd(); */ + /* } else */ + /* log_debug("Hmm, can't disable nscd."); */ + + if (!serialization) { + if (arg_show_status) + status_welcome(); + modprobe_setup(arg_nomodules); + kmod_setup(); + hostname_setup(); + loopback_setup(); + } } if ((r = manager_new(arg_running_as, &m)) < 0) { @@ -962,14 +1001,20 @@ int main(int argc, char *argv[]) { fclose(serialization); serialization = NULL; } else { + DBusError error; + + dbus_error_init(&error); + log_debug("Activating default unit: %s", arg_default_unit); - if ((r = manager_load_unit(m, arg_default_unit, NULL, &target)) < 0) { - log_error("Failed to load default target: %s", strerror(-r)); + if ((r = manager_load_unit(m, arg_default_unit, NULL, &error, &target)) < 0) { + log_error("Failed to load default target: %s", bus_error(&error, r)); + dbus_error_free(&error); 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)); + if ((r = manager_load_unit(m, SPECIAL_RESCUE_TARGET, NULL, &error, &target)) < 0) { + log_error("Failed to load rescue target: %s", bus_error(&error, r)); + dbus_error_free(&error); goto finish; } } @@ -979,11 +1024,27 @@ int main(int argc, char *argv[]) { 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)); + if ((r = manager_add_job(m, JOB_START, target, JOB_REPLACE, false, &error, NULL)) < 0) { + log_error("Failed to start default target: %s", bus_error(&error, r)); + dbus_error_free(&error); goto finish; } + if (arg_console && arg_running_as == MANAGER_SYSTEM) { + char *name; + + if (asprintf(&name, "getty@%s.service", arg_console) < 0) + log_error("Out of memory while generating console getty service name."); + else { + if ((r = manager_add_job_by_name(m, JOB_START, name, JOB_FAIL, false, &error, NULL)) < 0) { + log_error("Failed to start console getty target: %s", bus_error(&error, r)); + dbus_error_free(&error); + } + + free(name); + } + } + if (arg_action == ACTION_TEST) { printf("-> By jobs:\n"); manager_dump_jobs(m, stdout, "\t"); @@ -1006,6 +1067,7 @@ int main(int argc, char *argv[]) { goto finish; case MANAGER_RELOAD: + log_info("Reloading."); if ((r = manager_reload(m)) < 0) log_error("Failed to reload: %s", strerror(-r)); break; @@ -1015,7 +1077,7 @@ int main(int argc, char *argv[]) { goto finish; reexecute = true; - log_debug("Reexecuting."); + log_notice("Reexecuting."); goto finish; default: @@ -1028,11 +1090,12 @@ finish: manager_free(m); free(arg_default_unit); + free(arg_console); dbus_shutdown(); if (reexecute) { - const char *args[11]; + const char *args[14]; unsigned i = 0; char sfd[16]; @@ -1047,8 +1110,22 @@ finish: args[i++] = "--log-target"; args[i++] = log_target_to_string(log_get_target()); - args[i++] = "--running-as"; - args[i++] = manager_running_as_to_string(arg_running_as); + if (arg_running_as == MANAGER_SYSTEM) + args[i++] = "--system"; + else + args[i++] = "--session"; + + if (arg_dump_core) + args[i++] = "--dump-core"; + + if (arg_crash_shell) + args[i++] = "--crash-shell"; + + if (arg_confirm_spawn) + args[i++] = "--confirm-spawn"; + + if (arg_show_status) + args[i++] = "--show-status"; snprintf(sfd, sizeof(sfd), "%i", fileno(serialization)); char_array_0(sfd); @@ -1056,9 +1133,6 @@ finish: args[i++] = "--deserialize"; args[i++] = sfd; - if (arg_confirm_spawn) - args[i++] = "--confirm-spawn"; - args[i++] = NULL; assert(i <= ELEMENTSOF(args)); @@ -1077,5 +1151,7 @@ finish: if (getpid() == 1) freeze(); + label_finish(); + return retval; }