X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fmain.c;h=d0587cb57b78722fcbd0cf9867764ee77177b1af;hp=aaddce86e0543fb83216fe2dadf6a62a74a3d656;hb=7d568925bda9797f611e36d1d00cd941701cb3c8;hpb=d8d5ab981a328dd60a39cb495cbf99ca73d76f61 diff --git a/src/main.c b/src/main.c index aaddce86e..d0587cb57 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. @@ -38,13 +38,14 @@ #include "hostname-setup.h" #include "loopback-setup.h" #include "kmod-setup.h" -#include "modprobe-setup.h" #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, @@ -61,8 +62,11 @@ static bool arg_dump_core = true; static bool arg_crash_shell = false; 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 bool arg_mount_auto = true; +static bool arg_swap_auto = true; +static char *arg_console = NULL; static FILE* serialization = NULL; @@ -115,10 +119,10 @@ _noreturn_ static void crash(int sig) { _exit(1); } else { - int status, r; + int status; /* Order things nicely. */ - if ((r = waitpid(pid, &status, 0)) < 0) + 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.", signal_to_string(sig)); @@ -240,7 +244,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); @@ -302,10 +307,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.")) { @@ -313,22 +324,41 @@ 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; + } else if (startswith(word, "console=")) { + const char *k; + size_t l; + char *w = NULL; + + k = word + 8; + l = strcspn(k, ","); + + /* Ignore the console setting if set to a VT */ + 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")) { + arg_show_status = false; + arg_sysv_console = false; } else { unsigned i; @@ -465,15 +495,18 @@ static int config_parse_cpu_affinity( 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" }, - { "CrashChVT", config_parse_int, &arg_crash_chvt, "Manager" }, - { "CPUAffinity", config_parse_cpu_affinity, NULL, "Manager" }, + { "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" }, + { "MountAuto", config_parse_bool, &arg_mount_auto, "Manager" }, + { "SwapAuto", config_parse_bool, &arg_swap_auto, "Manager" }, { NULL, NULL, NULL, NULL } }; @@ -512,7 +545,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; } @@ -554,6 +587,7 @@ static int parse_argv(int argc, char *argv[]) { ARG_CRASH_SHELL, ARG_CONFIRM_SPAWN, ARG_SHOW_STATUS, + ARG_SYSV_CONSOLE, ARG_DESERIALIZE, ARG_INTROSPECT }; @@ -572,7 +606,8 @@ static int parse_argv(int argc, char *argv[]) { { "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 } @@ -666,7 +701,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: { @@ -754,7 +809,8 @@ static int help(void) { " --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" @@ -820,9 +876,7 @@ fail: int main(int argc, char *argv[]) { Manager *m = NULL; - Unit *target = NULL; - Job *job = NULL; - int r, retval = 1; + int r, retval = EXIT_FAILURE; FDSet *fds = NULL; bool reexecute = false; @@ -836,13 +890,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_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); @@ -880,10 +937,10 @@ int main(int argc, char *argv[]) { goto finish; } else if (arg_action == ACTION_DUMP_CONFIGURATION_ITEMS) { unit_dump_config_items(stdout); - retval = 0; + retval = EXIT_SUCCESS; goto finish; } else if (arg_action == ACTION_DONE) { - retval = 0; + retval = EXIT_SUCCESS; goto finish; } @@ -934,26 +991,16 @@ int main(int argc, char *argv[]) { if (getpid() == 1) install_crash_handler(); - log_info(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 "; " DISTRIBUTION ")", manager_running_as_to_string(arg_running_as)); - if (arg_running_as == MANAGER_SYSTEM) { + if (arg_running_as == MANAGER_SYSTEM && !serialization) { + if (arg_show_status) + status_welcome(); - /* 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(); - } + kmod_setup(); + hostname_setup(); + loopback_setup(); } if ((r = manager_new(arg_running_as, &m)) < 0) { @@ -963,6 +1010,12 @@ int main(int argc, char *argv[]) { m->confirm_spawn = arg_confirm_spawn; m->show_status = arg_show_status; + m->sysv_console = arg_sysv_console; + m->mount_auto = arg_mount_auto; + m->swap_auto = arg_swap_auto; + + if (arg_console) + manager_set_console(m, arg_console); if ((r = manager_startup(m, serialization, fds)) < 0) log_error("Failed to fully start up daemon: %s", strerror(-r)); @@ -980,6 +1033,7 @@ int main(int argc, char *argv[]) { serialization = NULL; } else { DBusError error; + Unit *target = NULL; dbus_error_init(&error); @@ -988,12 +1042,19 @@ int main(int argc, char *argv[]) { 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); + } else if (target->meta.load_state != UNIT_LOADED) + log_error("Failed to load default target: %s", strerror(-target->meta.load_error)); + if (!target || target->meta.load_state != UNIT_LOADED) { log_info("Trying to load rescue target..."); + 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; + } else if (target->meta.load_state != UNIT_LOADED) { + log_error("Failed to load rescue target: %s", strerror(-target->meta.load_error)); + goto finish; } } @@ -1002,7 +1063,7 @@ int main(int argc, char *argv[]) { manager_dump_units(m, stdout, "\t"); } - if ((r = manager_add_job(m, JOB_START, target, JOB_REPLACE, false, &error, &job)) < 0) { + 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; @@ -1011,7 +1072,7 @@ int main(int argc, char *argv[]) { if (arg_action == ACTION_TEST) { printf("-> By jobs:\n"); manager_dump_jobs(m, stdout, "\t"); - retval = 0; + retval = EXIT_SUCCESS; goto finish; } } @@ -1025,7 +1086,7 @@ int main(int argc, char *argv[]) { switch (m->exit_code) { case MANAGER_EXIT: - retval = 0; + retval = EXIT_SUCCESS; log_debug("Exit."); goto finish; @@ -1053,11 +1114,14 @@ finish: manager_free(m); free(arg_default_unit); + free(arg_console); dbus_shutdown(); + label_finish(); + if (reexecute) { - const char *args[14]; + const char *args[15]; unsigned i = 0; char sfd[16]; @@ -1087,7 +1151,14 @@ finish: args[i++] = "--confirm-spawn"; if (arg_show_status) - args[i++] = "--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);