diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2021-08-07 10:16:19 +0200 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2021-08-11 09:11:42 +0200 |
| commit | 4ab3d29ff03c0508f47846875d9310cbc5b8cd0f (patch) | |
| tree | a4b268f1d168b9c5b6587343142de20f4bf6116c /src/run | |
| parent | d340bdd1bd435e9f5524f4246feaf38511b2ff45 (diff) | |
| download | systemd-4ab3d29ff03c0508f47846875d9310cbc5b8cd0f.tar.gz | |
Add implicit sentinel to strv_env_merge()
Just to make it a tiny bit nicer to use.
Diffstat (limited to 'src/run')
| -rw-r--r-- | src/run/run.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/run/run.c b/src/run/run.c index 0be974f03a..993f1bc4f4 100644 --- a/src/run/run.c +++ b/src/run/run.c @@ -1526,7 +1526,7 @@ static int start_transient_scope(sd_bus *bus) { return log_error_errno(errno, "Failed to change UID to " UID_FMT ": %m", uid); } - env = strv_env_merge(3, environ, user_env, arg_environment); + env = strv_env_merge(environ, user_env, arg_environment); if (!env) return log_oom(); |