From e03ae6615a1fe9a2aee854d00c3fc7397a06983d Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Mon, 14 Mar 2011 21:47:41 +0100 Subject: [PATCH] manager: don't show kernel boot-up time for containers --- TODO | 2 ++ src/manager.c | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/TODO b/TODO index 4fc728ff..522ef592 100644 --- a/TODO +++ b/TODO @@ -26,6 +26,8 @@ F15: * remove getty magic, move it into a generator +* recreate private socket on SIGUSR2 + Features: * optionally create watched directories in .path units diff --git a/src/manager.c b/src/manager.c index 919560b0..df75eca8 100644 --- a/src/manager.c +++ b/src/manager.c @@ -2841,7 +2841,8 @@ void manager_check_finished(Manager *m) { 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), -- 2.39.5