picnoir
/
Systemd
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

core: add 'D' in confirmat spawn to show a full dump of the unit to spawn

This commit is contained in:
Franck Bui 2016-11-12 15:08:29 +01:00
parent eedf223a30
commit dd6f9ac0d0
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -5,6 +5,7 @@ CHANGES WITH 233 in spe
* The confirmation spawn prompt has been reworked to offer the
following choices:
(D)ump, show the state of the unit
(f)ail, don't execute the command and pretend it failed
(h)elp
(i)nfo, show a short summary of the unit

10
src/core/execute.c
View File

@ -740,7 +740,7 @@ static int ask_for_confirmation(const char *vc, Unit *u, const char *cmdline) {
}
for (;;) {
r = ask_char(&c, "yfshi", "Execute %s? [y, f, s – h for help] ", e);
r = ask_char(&c, "yfshiD", "Execute %s? [y, f, s – h for help] ", e);
if (r < 0) {
write_confirm_error_fd(r, STDOUT_FILENO);
r = CONFIRM_EXECUTE;
@ -748,17 +748,21 @@ static int ask_for_confirmation(const char *vc, Unit *u, const char *cmdline) {
}
switch (c) {
case 'D':
unit_dump(u, stdout, " ");
continue; /* ask again */
case 'f':
printf("Failing execution.\n");
r = CONFIRM_PRETEND_FAILURE;
break;
case 'h':
printf(" f - fail, don't execute the command and pretend it failed\n"
printf(" D - dump, show the state of the unit\n"
" 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;
continue; /* ask again */
case 'i':
printf(" Description: %s\n"
" Unit: %s\n"