core: Remove explicit Plymouth integration

[elogind.git] / src / core / manager.c

diff --git a/src/core/manager.c b/src/core/manager.c
index d92e048e2468cf61ababfd9d4c310d305b3d6315..1afd359df256a78787a7672ae3d4300a3a1e6c5e 100644 (file)
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -838,7 +838,8 @@ static unsigned manager_dispatch_gc_queue(Manager *m) {
 
                 if (u->gc_marker == gc_marker + GC_OFFSET_BAD ||
                     u->gc_marker == gc_marker + GC_OFFSET_UNSURE) {
-                        log_unit_debug(u->id, "Collecting %s", u->id);
+                        if (u->id)
+                                log_unit_debug(u->id, "Collecting %s", u->id);
                         u->gc_marker = gc_marker + GC_OFFSET_BAD;
                         unit_add_to_cleanup_queue(u);
                 }
@@ -3008,9 +3009,7 @@ static bool manager_get_show_status(Manager *m, StatusType type) {
         if (m->show_status > 0)
                 return true;
 
-        /* If Plymouth is running make sure we show the status, so
-         * that there's something nice to see when people press Esc */
-        return plymouth_running();
+        return false;
 }
 
 void manager_set_first_boot(Manager *m, bool b) {