diff options
| author | Franck Bui <fbui@suse.com> | 2016-11-12 14:55:12 +0100 |
|---|---|---|
| committer | Franck Bui <fbui@suse.com> | 2016-11-17 18:16:50 +0100 |
| commit | eedf223a30cca99b5d82f620437d2366be0eaf30 (patch) | |
| tree | a4763710b27e5ffc464aadb679778b601fe9089c /src/core | |
| parent | d172b175f6d43d68929975e3baa3837da677bc68 (diff) | |
core: add 'i' in confirm spawn to give a short summary of the unit to spawn
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/execute.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/core/execute.c b/src/core/execute.c index 65ba9acf7a..b48a5732f3 100644 --- a/src/core/execute.c +++ b/src/core/execute.c @@ -720,7 +720,7 @@ enum { CONFIRM_EXECUTE = 1, }; -static int ask_for_confirmation(const char *vc, const char *cmdline) { +static int ask_for_confirmation(const char *vc, Unit *u, const char *cmdline) { int saved_stdout = -1, saved_stdin = -1, r; _cleanup_free_ char *e = NULL; char c; @@ -740,7 +740,7 @@ static int ask_for_confirmation(const char *vc, const char *cmdline) { } for (;;) { - r = ask_char(&c, "yfsh", "Execute %s? [y, f, s – h for help] ", e); + r = ask_char(&c, "yfshi", "Execute %s? [y, f, s – h for help] ", e); if (r < 0) { write_confirm_error_fd(r, STDOUT_FILENO); r = CONFIRM_EXECUTE; @@ -755,9 +755,16 @@ static int ask_for_confirmation(const char *vc, const char *cmdline) { case 'h': printf(" f - fail, don't execute the command and pretend it failed\n" " h - help\n" + " i - info, show a short summary of the unit\n" " s - skip, don't execute the command and pretend it succeeded\n" " y - yes, execute the command\n"); continue; + case 'i': + printf(" Description: %s\n" + " Unit: %s\n" + " Command: %s\n", + u->id, u->description, cmdline); + continue; /* ask again */ case 's': printf("Skipping execution.\n"); r = CONFIRM_PRETEND_SUCCESS; @@ -2368,7 +2375,7 @@ static int exec_child( return -ENOMEM; } - r = ask_for_confirmation(vc, cmdline); + r = ask_for_confirmation(vc, unit, cmdline); if (r != CONFIRM_EXECUTE) { if (r == CONFIRM_PRETEND_SUCCESS) { *exit_status = EXIT_SUCCESS; |