From: Dimitri John Ledkov <xnox@ubuntu.com>
Date: Wed, 12 Sep 2018 18:51:23 +0000 (+0100)
Subject: core: execute environment_generators with manager's environment
X-Git-Tag: v240~691^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ea368f0bd2b77bbc67eab42471b470582f0bd6bc;p=thirdparty%2Fsystemd.git

core: execute environment_generators with manager's environment
---

diff --git a/src/core/manager.c b/src/core/manager.c
index f86b924d024..f3c04856305 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -3788,7 +3788,7 @@ static int manager_run_environment_generators(Manager *m) {
         if (!generator_path_any(paths))
                 return 0;
 
-        return execute_directories(paths, DEFAULT_TIMEOUT_USEC, gather_environment, args, NULL, NULL);
+        return execute_directories(paths, DEFAULT_TIMEOUT_USEC, gather_environment, args, NULL, m->environment);
 }
 
 static int manager_run_generators(Manager *m) {