X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain.c;h=68da330b10b6fc3ca13746ab2b79450abf068aa6;hb=8e1e105b4550a7beb5c02d6d75748319781ae3d4;hp=cddfc88454f2dd14772195392efb2c60ca608f9f;hpb=0ff4cdd967246bbc44f66470c2e96b403ee77aed;p=elogind.git diff --git a/src/main.c b/src/main.c index cddfc8845..68da330b1 100644 --- a/src/main.c +++ b/src/main.c @@ -45,6 +45,8 @@ #include "conf-parser.h" #include "bus-errors.h" #include "missing.h" +#include "label.h" +#include "build.h" static enum { ACTION_RUN, @@ -64,6 +66,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; @@ -116,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)); @@ -241,7 +244,6 @@ static int parse_proc_cmdline_word(const char *word) { "4", SPECIAL_RUNLEVEL4_TARGET, "5", SPECIAL_RUNLEVEL5_TARGET }; - bool ignore_quiet = false; if (startswith(word, "systemd.unit=")) return set_default_unit(word + 13); @@ -303,10 +305,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.")) { @@ -314,16 +322,17 @@ 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; @@ -347,8 +356,8 @@ static int parse_proc_cmdline_word(const char *word) { arg_console = w; } else if (streq(word, "quiet")) { - if (!ignore_quiet) - arg_show_status = false; + arg_show_status = false; + arg_sysv_console = false; } else { unsigned i; @@ -492,6 +501,7 @@ static int parse_config_file(void) { { "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 } @@ -532,7 +542,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; } @@ -574,6 +584,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 }; @@ -592,7 +603,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 } @@ -686,7 +698,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: { @@ -774,7 +806,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" @@ -956,17 +989,14 @@ 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 ")", manager_running_as_to_string(arg_running_as)); 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."); */ + nss_disable_nscd(); if (!serialization) { if (arg_show_status) @@ -985,6 +1015,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)); @@ -1095,7 +1126,7 @@ finish: dbus_shutdown(); if (reexecute) { - const char *args[14]; + const char *args[15]; unsigned i = 0; char sfd[16]; @@ -1125,7 +1156,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);