summaryrefslogtreecommitdiffstats
path: root/src/core/main.c
diff options
context:
space:
mode:
authorDaan De Meyer <daan.j.demeyer@gmail.com>2021-09-07 17:13:56 +0200
committerLuca Boccassi <luca.boccassi@gmail.com>2021-09-10 15:03:55 +0200
commita4303b4096d9a75acd09c5b897ed3d20c9bca6de (patch)
tree4cecfd37d3efdce05a1df5acb4c50ccf789fc604 /src/core/main.c
parentid128: clarify that the "well-known" IDs are about GPT partition types (diff)
downloadsystemd-a4303b4096d9a75acd09c5b897ed3d20c9bca6de.tar.xz
systemd-a4303b4096d9a75acd09c5b897ed3d20c9bca6de.zip
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.
Diffstat (limited to 'src/core/main.c')
-rw-r--r--src/core/main.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/core/main.c b/src/core/main.c
index 0914f92a2e..7c915ccbcc 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;
}