#include "fdset.h"
#include "special.h"
#include "conf-parser.h"
+#include "bus-errors.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);
}
}
assert(lvalue);
assert(rvalue);
- FOREACH_WORD(w, l, rvalue, state) {
+ FOREACH_WORD_QUOTED(w, l, rvalue, state) {
char *t;
int r;
unsigned cpu;
log_show_color(true);
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 (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();
+ if (arg_show_status)
+ status_welcome();
modprobe_setup(arg_nomodules);
kmod_setup();
hostname_setup();
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: