#include "load-fragment.h"
#include "fdset.h"
#include "special.h"
+#include "conf-parser.h"
+#include "bus-errors.h"
+#include "missing.h"
static enum {
ACTION_RUN,
_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;
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;
/* 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);
}
}
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" },
+ { "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;
ARG_LOG_COLOR,
ARG_LOG_LOCATION,
ARG_UNIT,
- ARG_RUNNING_AS,
+ ARG_SYSTEM,
+ ARG_SESSION,
ARG_TEST,
ARG_DUMP_CONFIGURATION_ITEMS,
ARG_DUMP_CORE,
{ "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 },
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) {
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;
arg_action = ACTION_HELP;
break;
+ case 'D':
+ log_set_max_level(LOG_DEBUG);
+ break;
+
case '?':
return -EINVAL;
" --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"
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;
}
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;
/* 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;
/* 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;
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) {
- modprobe_setup(arg_nomodules);
- kmod_setup();
- hostname_setup();
- loopback_setup();
+
+ /* 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) {
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;
}
}
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, &job)) < 0) {
+ log_error("Failed to start default target: %s", bus_error(&error, r));
+ dbus_error_free(&error);
goto finish;
}
goto finish;
case MANAGER_RELOAD:
+ log_info("Reloading.");
if ((r = manager_reload(m)) < 0)
log_error("Failed to reload: %s", strerror(-r));
break;
goto finish;
reexecute = true;
- log_debug("Reexecuting.");
+ log_notice("Reexecuting.");
goto finish;
default:
dbus_shutdown();
if (reexecute) {
- const char *args[11];
+ const char *args[14];
unsigned i = 0;
char sfd[16];
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);
args[i++] = "--deserialize";
args[i++] = sfd;
- if (arg_confirm_spawn)
- args[i++] = "--confirm-spawn";
-
args[i++] = NULL;
assert(i <= ELEMENTSOF(args));
~ianmdlvl / elogind.git / blobdiff