diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2013-09-08 07:51:39 -0400 |
|---|---|---|
| committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2013-09-09 13:49:30 -0400 |
| commit | c9d954b27ee125c3c90a6d2951c62eec4abb160b (patch) | |
| tree | 2a1e3a376ce997b95c5dfa41e50ca48bf2f347df /src/run | |
| parent | 116cc028742836e61abce7582ec9ecf9f0aaeb53 (diff) | |
run: allow non-absolute paths as command
Diffstat (limited to 'src/run')
| -rw-r--r-- | src/run/run.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/src/run/run.c b/src/run/run.c index c5d314bdf1..da8c788eea 100644 --- a/src/run/run.c +++ b/src/run/run.c @@ -39,7 +39,7 @@ static bool arg_send_sighup = false; static int help(void) { - printf("%s [OPTIONS...] [COMMAND LINE...]\n\n" + printf("%s [OPTIONS...] COMMAND [ARGS...]\n\n" "Run the specified command in a transient scope or service unit.\n\n" " -h --help Show this help\n" " --version Show package version\n" @@ -324,7 +324,7 @@ static int start_transient_scope( int main(int argc, char* argv[]) { sd_bus_error error = SD_BUS_ERROR_NULL; _cleanup_bus_unref_ sd_bus *bus = NULL; - _cleanup_free_ char *description = NULL; + _cleanup_free_ char *description = NULL, *command = NULL; int r; log_parse_environment(); @@ -334,6 +334,13 @@ int main(int argc, char* argv[]) { if (r <= 0) goto fail; + r = find_binary(argv[optind], &command); + if (r < 0) { + log_error("Failed to find executable %s: %s", argv[optind], strerror(-r)); + goto fail; + } + argv[optind] = command; + if (!arg_description) { description = strv_join(argv + optind, " "); if (!description) { |