systemctl: don't hit an assert when we are run from a non-systemd boot

[elogind.git] / src / main.c

diff --git a/src/main.c b/src/main.c
index aaddce86e0543fb83216fe2dadf6a62a74a3d656..e67d2225bd41d029580948e9046ec8d49115b1a7 100644 (file)
--- a/src/main.c
+++ b/src/main.c
@@ -836,7 +836,7 @@ int main(int argc, char *argv[]) {
                 return 1;
         }
 
-        log_show_color(true);
+        log_show_color(isatty(STDERR_FILENO) > 0);
         log_show_location(false);
         log_set_max_level(LOG_INFO);
 
@@ -940,11 +940,11 @@ int main(int argc, char *argv[]) {
 
                 /* 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 (nss_disable_nscd) { */
+                /*         log_debug("Disabling nscd"); */
+                /*         nss_disable_nscd(); */
+                /* } else */
+                /*         log_debug("Hmm, can't disable nscd."); */
 
                 if (!serialization) {
                         if (arg_show_status)