diff options
| author | Lennart Poettering <lennart@poettering.net> | 2011-03-14 21:47:41 +0100 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2011-03-14 21:47:41 +0100 |
| commit | e03ae6615a1fe9a2aee854d00c3fc7397a06983d (patch) | |
| tree | 9b555e15a79f9f275e297633acc456e061dbb625 | |
| parent | 72fe22f93059ec6bbc9c9da0171e3be9d8b1c9ce (diff) | |
manager: don't show kernel boot-up time for containers
| -rw-r--r-- | TODO | 2 | ||||
| -rw-r--r-- | src/manager.c | 3 |
2 files changed, 4 insertions, 1 deletions
@@ -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 919560b054..df75eca8c4 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), |