[MINOR] startup: don't imply -q with -D

It is recommended to have -D in init scripts, but -D also implies
quiet mode, which hides warning messages, and both options are now
completely unrelated. Remove the implication to get warnings with
-D.
(cherry picked from commit b885b7eb6e12b0f0cfd2fa7d692830e696dabe68)

diff --git a/src/haproxy.c b/src/haproxy.c
index 5b944abbb2522743d17c0062a5c30695144e98bb..c4b83a7a677fc330cbb988c63f64e52a7bfa9614 100644 (file)
--- a/src/haproxy.c
+++ b/src/haproxy.c
@@ -205,7 +205,7 @@ void usage(char *name)
                "        -v displays version ; -vv shows known build options.\n"
                "        -d enters debug mode ; -db only disables background mode.\n"
                "        -V enters verbose mode (disables quiet mode)\n"
-               "        -D goes daemon ; implies -q\n"
+               "        -D goes daemon\n"
                "        -q quiet mode : don't display messages\n"
                "        -c check mode : only check config file and exit\n"
                "        -n sets the maximum total # of connections (%d)\n"
@@ -475,7 +475,7 @@ void init(int argc, char **argv)
                        else if (*flag == 'c')
                                arg_mode |= MODE_CHECK;
                        else if (*flag == 'D')
-                               arg_mode |= MODE_DAEMON | MODE_QUIET;
+                               arg_mode |= MODE_DAEMON;
                        else if (*flag == 'q')
                                arg_mode |= MODE_QUIET;
                        else if (*flag == 's' && (flag[1] == 'f' || flag[1] == 't')) {