diff options
| author | Daan De Meyer <daan.j.demeyer@gmail.com> | 2021-09-07 16:13:56 +0100 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2021-10-12 17:57:47 +0200 |
| commit | f9795ca578a4b3dfc808d62246461d2c5141d3f6 (patch) | |
| tree | 19c107b8f04942a628367afbc4206e0a2f68092c | |
| parent | 5e44156893515e031491346f7cac960c9317ccd0 (diff) | |
| download | systemd-f9795ca578a4b3dfc808d62246461d2c5141d3f6.tar.gz | |
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.
(cherry picked from commit a4303b4096d9a75acd09c5b897ed3d20c9bca6de)
(cherry picked from commit b246b5370e95756e9597d8ec967ae030b442e73f)
| -rw-r--r-- | src/core/main.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/core/main.c b/src/core/main.c index fd3691f6f9..1d45a9dc69 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -2453,6 +2453,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; } |