#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"
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;
"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 (streq(word, "quiet")) {
arg_show_status = false;
arg_sysv_console = false;
} else {
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. */
- nss_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) {