From: Franck Bui <fbui@suse.com>
Date: Thu, 17 Nov 2016 17:22:43 +0000 (+0100)
Subject: core: in confirm spawn, suggest 'f' when user selects 'n' choice
X-Git-Tag: v233~411^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F4538%2Fhead;p=thirdparty%2Fsystemd.git

core: in confirm spawn, suggest 'f' when user selects 'n' choice
---

diff --git a/src/core/execute.c b/src/core/execute.c
index 53aed1f2876..084eca334ca 100644
--- a/src/core/execute.c
+++ b/src/core/execute.c
@@ -746,7 +746,7 @@ static int ask_for_confirmation(const char *vc, Unit *u, const char *cmdline) {
         }
 
         for (;;) {
-                r = ask_char(&c, "yfshiDjc", "Execute %s? [y, f, s – h for help] ", e);
+                r = ask_char(&c, "yfshiDjcn", "Execute %s? [y, f, s – h for help] ", e);
                 if (r < 0) {
                         write_confirm_error_fd(r, STDOUT_FILENO, u);
                         r = CONFIRM_EXECUTE;
@@ -785,6 +785,10 @@ static int ask_for_confirmation(const char *vc, Unit *u, const char *cmdline) {
                 case 'j':
                         manager_dump_jobs(u->manager, stdout, "  ");
                         continue; /* ask again */
+                case 'n':
+                        /* 'n' was removed in favor of 'f'. */
+                        printf("Didn't understand 'n', did you mean 'f'?\n");
+                        continue; /* ask again */
                 case 's':
                         printf("Skipping execution.\n");
                         r = CONFIRM_PRETEND_SUCCESS;