From eb523bfb5155f07bbc2a4b4a37c81270c3c6153b Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 9 Oct 2018 19:42:28 +0200 Subject: [PATCH] core: include environment generator runtime in generator timestamps Currently they aren't covered and it probably isn't worth adding another kind of timestamp just for this, hence simply include it in the regular generator timestamps. --- src/core/manager.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/core/manager.c b/src/core/manager.c index 653fce8368a..2dea89dc01f 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -1626,12 +1626,10 @@ int manager_startup(Manager *m, FILE *serialization, FDSet *fds) { if (r < 0) return log_error_errno(r, "Failed to initialize path lookup table: %m"); - r = manager_run_environment_generators(m); - if (r < 0) - return r; - dual_timestamp_get(m->timestamps + manager_timestamp_initrd_mangle(MANAGER_TIMESTAMP_GENERATORS_START)); - r = manager_run_generators(m); + r = manager_run_environment_generators(m); + if (r >= 0) + r = manager_run_generators(m); dual_timestamp_get(m->timestamps + manager_timestamp_initrd_mangle(MANAGER_TIMESTAMP_GENERATORS_FINISH)); if (r < 0) return r; -- 2.47.3