diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2016-12-10 01:29:52 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-12-10 01:29:52 -0500 |
| commit | 1ac7a935740662bffd89eefc6655e459181188b1 (patch) | |
| tree | 7f846741c7c23d8949ae9abef26dbec34ad1ce47 /src/core/service.c | |
| parent | 4a5567d5d6ab01974dd089eb8907fecd6aff4fcf (diff) | |
| parent | 03fc9c723cfc59467a7fccc305f34273f8564b25 (diff) | |
Merge pull request #4835 from poettering/unit-name-printf
Various specifier resolution fixes.
Diffstat (limited to 'src/core/service.c')
| -rw-r--r-- | src/core/service.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/src/core/service.c b/src/core/service.c index 61246d831d..576416ad29 100644 --- a/src/core/service.c +++ b/src/core/service.c @@ -49,7 +49,6 @@ #include "string-util.h" #include "strv.h" #include "unit-name.h" -#include "unit-printf.h" #include "unit.h" #include "utf8.h" #include "util.h" @@ -1205,7 +1204,7 @@ static int service_spawn( ExecFlags flags, pid_t *_pid) { - _cleanup_strv_free_ char **argv = NULL, **final_env = NULL, **our_env = NULL, **fd_names = NULL; + _cleanup_strv_free_ char **final_env = NULL, **our_env = NULL, **fd_names = NULL; _cleanup_free_ int *fds = NULL; unsigned n_fds = 0, n_env = 0; const char *path; @@ -1263,10 +1262,6 @@ static int service_spawn( if (r < 0) return r; - r = unit_full_printf_strv(UNIT(s), c->argv, &argv); - if (r < 0) - return r; - our_env = new0(char*, 9); if (!our_env) return -ENOMEM; @@ -1349,7 +1344,7 @@ static int service_spawn( } else path = UNIT(s)->cgroup_path; - exec_params.argv = argv; + exec_params.argv = c->argv; exec_params.environment = final_env; exec_params.fds = fds; exec_params.fd_names = fd_names; |