X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain.c;h=68da330b10b6fc3ca13746ab2b79450abf068aa6;hb=8e1e105b4550a7beb5c02d6d75748319781ae3d4;hp=72015bc544f3766519a8b041ff7112d58e62a317;hpb=e51bc1a23e8f581e4fe46aa4df1bd93b7042c184;p=elogind.git

diff --git a/src/main.c b/src/main.c
index 72015bc54..68da330b1 100644
--- a/src/main.c
+++ b/src/main.c
@@ -46,6 +46,7 @@
 #include "bus-errors.h"
 #include "missing.h"
 #include "label.h"
+#include "build.h"
 
 static enum {
         ACTION_RUN,
@@ -988,17 +989,14 @@ int main(int argc, char *argv[]) {
         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) {
 
                 /* 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."); */
+                nss_disable_nscd();
 
                 if (!serialization) {
                         if (arg_show_status)