-/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/*-*- Mode: C; c-basic-offset: 8; indent-tabs-mode: nil -*-*/
/***
This file is part of systemd.
#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,
} arg_action = ACTION_RUN;
static char *arg_default_unit = NULL;
-static char *arg_console = NULL;
static ManagerRunningAs arg_running_as = _MANAGER_RUNNING_AS_INVALID;
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;
"5", SPECIAL_RUNLEVEL5_TARGET
};
+ assert(word);
+
if (startswith(word, "systemd.unit="))
return set_default_unit(word + 13);
"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 (startswith(word, "console=")) {
- const char *k;
- size_t l;
- char *w = NULL;
-
- k = word + 8;
- l = strcspn(k, ",");
-
- 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;
int main(int argc, char *argv[]) {
Manager *m = NULL;
- Unit *target = NULL;
int r, retval = 1;
FDSet *fds = NULL;
bool reexecute = false;
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) {
+ 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) {
serialization = NULL;
} else {
DBusError error;
+ Unit *target = NULL;
dbus_error_init(&error);
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;
}
}
goto finish;
}
- if (arg_console && arg_running_as == MANAGER_SYSTEM) {
- char *name;
-
- if (asprintf(&name, "getty@%s.service", arg_console) < 0)
- log_error("Out of memory while generating console getty service name.");
- else {
- if ((r = manager_add_job_by_name(m, JOB_START, name, JOB_FAIL, false, &error, NULL)) < 0) {
- log_error("Failed to start console getty target: %s", bus_error(&error, r));
- dbus_error_free(&error);
- }
-
- free(name);
- }
- }
-
if (arg_action == ACTION_TEST) {
printf("-> By jobs:\n");
manager_dump_jobs(m, stdout, "\t");
manager_free(m);
free(arg_default_unit);
- free(arg_console);
dbus_shutdown();