X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fmain.c;h=43b469fb06e2cde615ea93d4f5a4534b5b53efa5;hp=df0da0be4fb09ee612f90a42c3a4ccbffec9ed52;hb=888c6216ca9239be260fd832f900b9fcd784f806;hpb=c846ff4798c4c48d229587297e6df8b593c60c54 diff --git a/src/main.c b/src/main.c index df0da0be4..43b469fb0 100644 --- a/src/main.c +++ b/src/main.c @@ -1,4 +1,4 @@ -/*-*- Mode: C; c-basic-offset: 8 -*-*/ +/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/ /*** This file is part of systemd. @@ -42,6 +42,11 @@ #include "load-fragment.h" #include "fdset.h" #include "special.h" +#include "conf-parser.h" +#include "bus-errors.h" +#include "missing.h" +#include "label.h" +#include "build.h" static enum { ACTION_RUN, @@ -60,6 +65,7 @@ static int arg_crash_chvt = -1; static bool arg_confirm_spawn = false; static bool arg_nomodules = false; static bool arg_show_status = true; +static bool arg_sysv_console = true; static FILE* serialization = NULL; @@ -74,7 +80,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; @@ -86,7 +92,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; @@ -112,15 +118,15 @@ _noreturn_ static void crash(int sig) { _exit(1); } else { - int status, r; + int status; /* Order things nicely. */ - if ((r = waitpid(pid, &status, 0)) < 0) - log_error("Caught <%s>, waitpid() failed: %s", strsignal(sig), strerror(errno)); + if (waitpid(pid, &status, 0) < 0) + 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); } } @@ -237,7 +243,8 @@ static int parse_proc_cmdline_word(const char *word) { "4", SPECIAL_RUNLEVEL4_TARGET, "5", SPECIAL_RUNLEVEL5_TARGET }; - bool ignore_quiet = false; + + assert(word); if (startswith(word, "systemd.unit=")) return set_default_unit(word + 13); @@ -299,10 +306,16 @@ static int parse_proc_cmdline_word(const char *word) { if ((r = parse_boolean(word + 20)) < 0) log_warning("Failed to parse show status switch %s, Ignoring.", word + 20); - else { + else arg_show_status = r; - ignore_quiet = true; - } + + } else if (startswith(word, "systemd.sysv_console=")) { + int r; + + if ((r = parse_boolean(word + 21)) < 0) + log_warning("Failed to parse SysV console switch %s, Ignoring.", word + 20); + else + arg_sysv_console = r; } else if (startswith(word, "systemd.")) { @@ -310,22 +323,24 @@ static int parse_proc_cmdline_word(const char *word) { log_info("Supported kernel switches:\n" "systemd.unit=UNIT Default unit to start\n" - "systemd.log_target=console|kmsg|syslog| Log target\n" - " syslog-org-kmsg|null\n" - "systemd.log_level=LEVEL Log level\n" - "systemd.log_color=0|1 Highlight important log messages\n" - "systemd.log_location=0|1 Include code location in log messages\n" "systemd.dump_core=0|1 Dump core on crash\n" "systemd.crash_shell=0|1 Run shell on crash\n" "systemd.crash_chvt=N Change to VT #N on crash\n" "systemd.confirm_spawn=0|1 Confirm every process spawn\n" - "systemd.show_status=0|1 Show status updates on the console during bootup\n"); + "systemd.show_status=0|1 Show status updates on the console during bootup\n" + "systemd.sysv_console=0|1 Connect output of SysV scripts to console\n" + "systemd.log_target=console|kmsg|syslog|syslog-org-kmsg|null\n" + " Log target\n" + "systemd.log_level=LEVEL Log level\n" + "systemd.log_color=0|1 Highlight important log messages\n" + "systemd.log_location=0|1 Include code location in log messages\n"); } else if (streq(word, "nomodules")) arg_nomodules = true; + else if (streq(word, "quiet")) { - if (!ignore_quiet) - arg_show_status = false; + arg_show_status = false; + arg_sysv_console = false; } else { unsigned i; @@ -338,6 +353,170 @@ static int parse_proc_cmdline_word(const char *word) { return 0; } +static int config_parse_level( + const char *filename, + unsigned line, + const char *section, + const char *lvalue, + const char *rvalue, + void *data, + void *userdata) { + + assert(filename); + assert(lvalue); + assert(rvalue); + + log_set_max_level_from_string(rvalue); + return 0; +} + +static int config_parse_target( + const char *filename, + unsigned line, + const char *section, + const char *lvalue, + const char *rvalue, + void *data, + void *userdata) { + + assert(filename); + assert(lvalue); + assert(rvalue); + + log_set_target_from_string(rvalue); + return 0; +} + +static int config_parse_color( + const char *filename, + unsigned line, + const char *section, + const char *lvalue, + const char *rvalue, + void *data, + void *userdata) { + + assert(filename); + assert(lvalue); + assert(rvalue); + + log_show_color_from_string(rvalue); + return 0; +} + +static int config_parse_location( + const char *filename, + unsigned line, + const char *section, + const char *lvalue, + const char *rvalue, + void *data, + void *userdata) { + + assert(filename); + assert(lvalue); + assert(rvalue); + + log_show_location_from_string(rvalue); + return 0; +} + +static int config_parse_cpu_affinity( + const char *filename, + unsigned line, + const char *section, + const char *lvalue, + const char *rvalue, + void *data, + void *userdata) { + + char *w; + size_t l; + char *state; + cpu_set_t *c = NULL; + unsigned ncpus = 0; + + assert(filename); + assert(lvalue); + assert(rvalue); + + FOREACH_WORD_QUOTED(w, l, rvalue, state) { + char *t; + int r; + unsigned cpu; + + if (!(t = strndup(w, l))) + return -ENOMEM; + + r = safe_atou(t, &cpu); + free(t); + + if (!c) + if (!(c = cpu_set_malloc(&ncpus))) + return -ENOMEM; + + if (r < 0 || cpu >= ncpus) { + log_error("[%s:%u] Failed to parse CPU affinity: %s", filename, line, rvalue); + CPU_FREE(c); + return -EBADMSG; + } + + CPU_SET_S(cpu, CPU_ALLOC_SIZE(ncpus), c); + } + + if (c) { + if (sched_setaffinity(0, CPU_ALLOC_SIZE(ncpus), c) < 0) + log_warning("Failed to set CPU affinity: %m"); + + CPU_FREE(c); + } + + return 0; +} + +static int parse_config_file(void) { + + const ConfigItem items[] = { + { "LogLevel", config_parse_level, NULL, "Manager" }, + { "LogTarget", config_parse_target, NULL, "Manager" }, + { "LogColor", config_parse_color, NULL, "Manager" }, + { "LogLocation", config_parse_location, NULL, "Manager" }, + { "DumpCore", config_parse_bool, &arg_dump_core, "Manager" }, + { "CrashShell", config_parse_bool, &arg_crash_shell, "Manager" }, + { "ShowStatus", config_parse_bool, &arg_show_status, "Manager" }, + { "SysVConsole", config_parse_bool, &arg_sysv_console,"Manager" }, + { "CrashChVT", config_parse_int, &arg_crash_chvt, "Manager" }, + { "CPUAffinity", config_parse_cpu_affinity, NULL, "Manager" }, + { NULL, NULL, NULL, NULL } + }; + + static const char * const sections[] = { + "Manager", + NULL + }; + + FILE *f; + const char *fn; + int r; + + fn = arg_running_as == MANAGER_SYSTEM ? SYSTEM_CONFIG_FILE : SESSION_CONFIG_FILE; + + if (!(f = fopen(fn, "re"))) { + if (errno == ENOENT) + return 0; + + log_warning("Failed to open configuration file '%s': %m", fn); + return 0; + } + + if ((r = config_parse(fn, f, sections, items, false, NULL)) < 0) + log_warning("Failed to parse configuration file: %s", strerror(-r)); + + fclose(f); + + return 0; +} + static int parse_proc_cmdline(void) { char *line; int r; @@ -346,7 +525,7 @@ static int parse_proc_cmdline(void) { char *state; if ((r = read_one_line_file("/proc/cmdline", &line)) < 0) { - log_warning("Failed to read /proc/cmdline, ignoring: %s", strerror(errno)); + log_warning("Failed to read /proc/cmdline, ignoring: %s", strerror(-r)); return 0; } @@ -380,13 +559,15 @@ 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, ARG_CRASH_SHELL, ARG_CONFIRM_SPAWN, ARG_SHOW_STATUS, + ARG_SYSV_CONSOLE, ARG_DESERIALIZE, ARG_INTROSPECT }; @@ -397,14 +578,16 @@ 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 }, { "dump-core", no_argument, NULL, ARG_DUMP_CORE }, { "crash-shell", no_argument, NULL, ARG_CRASH_SHELL }, { "confirm-spawn", no_argument, NULL, ARG_CONFIRM_SPAWN }, - { "show-status", no_argument, NULL, ARG_SHOW_STATUS }, + { "show-status", optional_argument, NULL, ARG_SHOW_STATUS }, + { "sysv-console", optional_argument, NULL, ARG_SYSV_CONSOLE }, { "deserialize", required_argument, NULL, ARG_DESERIALIZE }, { "introspect", optional_argument, NULL, ARG_INTROSPECT }, { NULL, 0, NULL, 0 } @@ -415,7 +598,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) { @@ -469,17 +652,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; @@ -502,7 +681,27 @@ static int parse_argv(int argc, char *argv[]) { break; case ARG_SHOW_STATUS: - arg_show_status = true; + + if (optarg) { + if ((r = parse_boolean(optarg)) < 0) { + log_error("Failed to show status boolean %s.", optarg); + return r; + } + arg_show_status = r; + } else + arg_show_status = true; + break; + + case ARG_SYSV_CONSOLE: + + if (optarg) { + if ((r = parse_boolean(optarg)) < 0) { + log_error("Failed to SysV console boolean %s.", optarg); + return r; + } + arg_sysv_console = r; + } else + arg_sysv_console = true; break; case ARG_DESERIALIZE: { @@ -552,6 +751,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; @@ -581,11 +784,13 @@ 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" - " --show-status Show status updates on the console during bootup\n" + " --show-status[=0|1] Show status updates on the console during bootup\n" + " --sysv-console[=0|1] Connect output of SysV scripts to console\n" " --log-target=TARGET Set log target (console, syslog, kmsg, syslog-or-kmsg, null)\n" " --log-level=LEVEL Set log level (debug, info, notice, warning, err, crit, alert, emerg)\n" " --log-color[=0|1] Highlight important log messages\n" @@ -604,7 +809,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; } @@ -652,7 +857,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; @@ -667,13 +871,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); @@ -684,7 +891,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; @@ -694,6 +901,9 @@ int main(int argc, char *argv[]) { /* If we are init, we can block sigkill. Yay. */ ignore_signals(SIGNALS_IGNORE, -1); + if (parse_config_file() < 0) + goto finish; + if (arg_running_as == MANAGER_SYSTEM) if (parse_proc_cmdline() < 0) goto finish; @@ -762,10 +972,13 @@ 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_full(arg_running_as == MANAGER_SYSTEM ? LOG_INFO : LOG_DEBUG, + PACKAGE_STRING " running in %s mode. (" SYSTEMD_FEATURES ")", manager_running_as_to_string(arg_running_as)); if (arg_running_as == MANAGER_SYSTEM && !serialization) { - status_welcome(); + if (arg_show_status) + status_welcome(); + modprobe_setup(arg_nomodules); kmod_setup(); hostname_setup(); @@ -779,6 +992,7 @@ int main(int argc, char *argv[]) { m->confirm_spawn = arg_confirm_spawn; m->show_status = arg_show_status; + m->sysv_console = arg_sysv_console; if ((r = manager_startup(m, serialization, fds)) < 0) log_error("Failed to fully start up daemon: %s", strerror(-r)); @@ -795,14 +1009,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; } } @@ -812,8 +1032,9 @@ 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; } @@ -839,6 +1060,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; @@ -848,7 +1070,7 @@ int main(int argc, char *argv[]) { goto finish; reexecute = true; - log_debug("Reexecuting."); + log_notice("Reexecuting."); goto finish; default: @@ -865,7 +1087,7 @@ finish: dbus_shutdown(); if (reexecute) { - const char *args[11]; + const char *args[15]; unsigned i = 0; char sfd[16]; @@ -880,8 +1102,29 @@ 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=1"; + else + args[i++] = "--show-status=0"; + + if (arg_sysv_console) + args[i++] = "--sysv-console=1"; + else + args[i++] = "--sysv-console=0"; snprintf(sfd, sizeof(sfd), "%i", fileno(serialization)); char_array_0(sfd); @@ -889,9 +1132,6 @@ finish: args[i++] = "--deserialize"; args[i++] = sfd; - if (arg_confirm_spawn) - args[i++] = "--confirm-spawn"; - args[i++] = NULL; assert(i <= ELEMENTSOF(args)); @@ -910,5 +1150,7 @@ finish: if (getpid() == 1) freeze(); + label_finish(); + return retval; }