X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fmain.c;h=d3c01b4a6764756ee03f387901b1c0253fa52775;hp=27ad4c4c80a9f0ddef2f02b83e497d10676313de;hb=ad780f1991d81c8013cc345488b9a035bf30aae7;hpb=edb9aaa8b27adf89cc712000318b1e9cf40ea296

diff --git a/src/main.c b/src/main.c
index 27ad4c4c8..d3c01b4a6 100644
--- a/src/main.c
+++ b/src/main.c
@@ -44,6 +44,7 @@
 #include "special.h"
 #include "conf-parser.h"
 #include "bus-errors.h"
+#include "missing.h"
 
 static enum {
         ACTION_RUN,
@@ -582,7 +583,7 @@ static int parse_argv(int argc, char *argv[]) {
         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) {
 
@@ -715,6 +716,10 @@ static int parse_argv(int argc, char *argv[]) {
                         arg_action = ACTION_HELP;
                         break;
 
+                case 'D':
+                        log_set_max_level(LOG_DEBUG);
+                        break;
+
                 case '?':
                         return -EINVAL;
 
@@ -931,13 +936,24 @@ int main(int argc, char *argv[]) {
 
         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) {