chiark / gitweb /
manager: don't show kernel boot-up time for containers
authorLennart Poettering <lennart@poettering.net>
Mon, 14 Mar 2011 20:47:41 +0000 (21:47 +0100)
committerLennart Poettering <lennart@poettering.net>
Mon, 14 Mar 2011 20:47:41 +0000 (21:47 +0100)
TODO
src/manager.c

diff --git a/TODO b/TODO
index 4fc728f..522ef59 100644 (file)
--- a/TODO
+++ b/TODO
@@ -26,6 +26,8 @@ F15:
 
 * remove getty magic, move it into a generator
 
 
 * remove getty magic, move it into a generator
 
+* recreate private socket on SIGUSR2
+
 Features:
 
 * optionally create watched directories in .path units
 Features:
 
 * optionally create watched directories in .path units
index 919560b..df75eca 100644 (file)
@@ -2841,7 +2841,8 @@ void manager_check_finished(Manager *m) {
 
         dual_timestamp_get(&m->finish_timestamp);
 
 
         dual_timestamp_get(&m->finish_timestamp);
 
-        if (m->running_as == MANAGER_SYSTEM) {
+        if (m->running_as == MANAGER_SYSTEM && detect_container(NULL) <= 0) {
+
                 if (dual_timestamp_is_set(&m->initrd_timestamp)) {
                         log_info("Startup finished in %s (kernel) + %s (initrd) + %s (userspace) = %s.",
                                  format_timespan(kernel, sizeof(kernel),
                 if (dual_timestamp_is_set(&m->initrd_timestamp)) {
                         log_info("Startup finished in %s (kernel) + %s (initrd) + %s (userspace) = %s.",
                                  format_timespan(kernel, sizeof(kernel),