#include "special.h"
#include "conf-parser.h"
#include "bus-errors.h"
+#include "missing.h"
static enum {
ACTION_RUN,
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) {
arg_action = ACTION_HELP;
break;
+ case 'D':
+ log_set_max_level(LOG_DEBUG);
+ break;
+
case '?':
return -EINVAL;
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_INFO);
log_info(PACKAGE_STRING " running in %s mode.", manager_running_as_to_string(arg_running_as));
- if (arg_running_as == MANAGER_SYSTEM && !serialization) {
- if (arg_show_status)
- status_welcome();
- modprobe_setup(arg_nomodules);
- kmod_setup();
- hostname_setup();
- loopback_setup();
+ 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.");
+
+ 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) {