diff options
| author | Ronan Pigott <ronan@rjp.ie> | 2023-02-27 22:57:06 -0700 |
|---|---|---|
| committer | Luca Boccassi <luca.boccassi@gmail.com> | 2023-03-10 00:05:37 +0000 |
| commit | 0b40688d1830abc6f59b1f1f67eccd757c23eb09 (patch) | |
| tree | 980095a20a4344d9d532d619eb183727a76a419f /src/core/main.c | |
| parent | 28f3cbbdedb53e8207fb361cf497ef74dfa52aab (diff) | |
| download | systemd-0b40688d1830abc6f59b1f1f67eccd757c23eb09.tar.gz | |
load-fragment: add user credential specifiers to user.conf
This enables the ManagerEnvironment= settings in the user's user.conf to
reference some user data like $HOME for the purpose of setting
environment variables derived from these values.
Diffstat (limited to 'src/core/main.c')
| -rw-r--r-- | src/core/main.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/main.c b/src/core/main.c index 79eaa4e5d6..7ebb447c03 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -664,8 +664,8 @@ static int parse_config_file(void) { { "Manager", "DefaultStartLimitInterval", config_parse_sec, 0, &arg_default_start_limit_interval }, /* obsolete alias */ { "Manager", "DefaultStartLimitIntervalSec", config_parse_sec, 0, &arg_default_start_limit_interval }, { "Manager", "DefaultStartLimitBurst", config_parse_unsigned, 0, &arg_default_start_limit_burst }, - { "Manager", "DefaultEnvironment", config_parse_environ, 0, &arg_default_environment }, - { "Manager", "ManagerEnvironment", config_parse_environ, 0, &arg_manager_environment }, + { "Manager", "DefaultEnvironment", config_parse_environ, arg_system, &arg_default_environment }, + { "Manager", "ManagerEnvironment", config_parse_environ, arg_system, &arg_manager_environment }, { "Manager", "DefaultLimitCPU", config_parse_rlimit, RLIMIT_CPU, arg_default_rlimit }, { "Manager", "DefaultLimitFSIZE", config_parse_rlimit, RLIMIT_FSIZE, arg_default_rlimit }, { "Manager", "DefaultLimitDATA", config_parse_rlimit, RLIMIT_DATA, arg_default_rlimit }, |