diff options
| -rw-r--r-- | man/systemd-run.xml | 11 | ||||
| -rw-r--r-- | src/run/run.c | 12 |
2 files changed, 15 insertions, 8 deletions
diff --git a/man/systemd-run.xml b/man/systemd-run.xml index f33190f4c5..73adbfb927 100644 --- a/man/systemd-run.xml +++ b/man/systemd-run.xml @@ -177,11 +177,12 @@ <varlistentry> <term><option>--expand-environment=<replaceable>BOOL</replaceable></option></term> - <listitem><para>Expand environment variables in command arguments. If enabled (the default), the - service manager that spawns the actual command will expand variables specified as - <literal>${<replaceable>VARIABLE</replaceable>}</literal> in the same way as in commands specied via - <varname>ExecStart=</varname> in units. Note that this is similar to, but not the same as variable - expansion in + <listitem><para>Expand environment variables in command arguments. If enabled (the default), + environment variables specified as <literal>${<replaceable>VARIABLE</replaceable>}</literal> will be + expanded in the same way as in commands specified via <varname>ExecStart=</varname> in units. With + <varname>--scope</varname>, this expansion is performed by <command>systemd-run</command> itself, and + in other cases by the service manager that spawns the command. Note that this is similar to, but not + the same as variable expansion in <citerefentry project='man-pages'><refentrytitle>bash</refentrytitle><manvolnum>1</manvolnum></citerefentry> and other shells.</para> diff --git a/src/run/run.c b/src/run/run.c index 3ad866aaa6..2f5ec9c73b 100644 --- a/src/run/run.c +++ b/src/run/run.c @@ -103,8 +103,7 @@ static int help(void) { " --description=TEXT Description for unit\n" " --slice=SLICE Run in the specified slice\n" " --slice-inherit Inherit the slice\n" - " --expand-environment=BOOL Control server-side expansion of environment\n" - " variables\n" + " --expand-environment=BOOL Control expansion of environment variables\n" " --no-block Do not wait until operation finished\n" " -r --remain-after-exit Leave service around until explicitly stopped\n" " --wait Wait until service stopped again\n" @@ -1472,7 +1471,7 @@ static int start_transient_scope(sd_bus *bus) { _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL; _cleanup_(sd_bus_message_unrefp) sd_bus_message *m = NULL, *reply = NULL; _cleanup_(bus_wait_for_jobs_freep) BusWaitForJobs *w = NULL; - _cleanup_strv_free_ char **env = NULL, **user_env = NULL; + _cleanup_strv_free_ char **env = NULL, **user_env = NULL, **expanded_cmdline = NULL; _cleanup_free_ char *scope = NULL; const char *object = NULL; sd_id128_t invocation_id; @@ -1614,6 +1613,13 @@ static int start_transient_scope(sd_bus *bus) { if (!arg_quiet) log_info("Running scope as unit: %s", scope); + if (arg_expand_environment) { + expanded_cmdline = replace_env_argv(arg_cmdline, env); + if (!expanded_cmdline) + return log_oom(); + arg_cmdline = expanded_cmdline; + } + execvpe(arg_cmdline[0], arg_cmdline, env); return log_error_errno(errno, "Failed to execute: %m"); |