From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Tue, 7 Sep 2021 15:13:56 +0000 (+0100)
Subject: core: Parse log environment settings again after applying manager environment
X-Git-Tag: v250-rc1~702
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a4303b4096d9a75acd09c5b897ed3d20c9bca6de;p=thirdparty%2Fsystemd.git

core: Parse log environment settings again after applying manager environment

Currently, SYSTEMD_LOG_LEVEL set in the ManagerEnvironment property in system.conf
or user.conf doesn't affect the manager's logging level. Parsing the logging environment
variables again after pushing the manager environment into the process environment
block makes sure any new environment changes also get taken into account for logging.
---

diff --git a/src/core/main.c b/src/core/main.c
index 0914f92a2e0..7c915ccbcc5 100644
--- a/src/core/main.c
+++ b/src/core/main.c
@@ -2469,6 +2469,9 @@ static int parse_configuration(const struct rlimit *saved_rlimit_nofile,
         /* Push variables into the manager environment block */
         setenv_manager_environment();
 
+        /* Parse log environment variables again to take into account any new environment variables. */
+        log_parse_environment();
+
         return 0;
 }