X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Frun%2Frun.c;h=18a4920f0371fd91bb5d1c0e3e775241554e73f6;hp=c5d314bdf1974701720017cbe7091dfa80a98275;hb=68313d3dfa2082dae8a06643d639e0200afc19fc;hpb=a6c0353b9268d5b780fb7ff05a10cb5031446e5d diff --git a/src/run/run.c b/src/run/run.c index c5d314bdf..18a4920f0 100644 --- a/src/run/run.c +++ b/src/run/run.c @@ -28,6 +28,7 @@ #include "strv.h" #include "build.h" #include "unit-name.h" +#include "path-util.h" static bool arg_scope = false; static bool arg_user = false; @@ -39,7 +40,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 +325,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 +335,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) {