From: Denis Vlasenko <vda.linux@googlemail.com>
Date: Sat, 27 Sep 2008 01:05:13 +0000 (-0000)
Subject: start_stop_daemon: accept (and ignore) -R <param>
X-Git-Tag: 1_13_0~150
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=75897ea6d50a479bb87f282ae91d3902da89d6bc;p=oweals%2Fbusybox.git

start_stop_daemon: accept (and ignore) -R <param>
---

diff --git a/debianutils/start_stop_daemon.c b/debianutils/start_stop_daemon.c
index 99864d0a4..ab607bde0 100644
--- a/debianutils/start_stop_daemon.c
+++ b/debianutils/start_stop_daemon.c
@@ -349,11 +349,11 @@ int start_stop_daemon_main(int argc UNUSED_PARAM, char **argv)
 	opt_complementary = "K:S:K--S:S--K:m?p:K?xpun:S?xa"
 		USE_FEATURE_START_STOP_DAEMON_FANCY("q-v");
 	opt = getopt32(argv, "KSbqtma:n:s:u:c:x:p:"
-		USE_FEATURE_START_STOP_DAEMON_FANCY("ovN:"),
-//		USE_FEATURE_START_STOP_DAEMON_FANCY("ovN:R:"),
+		USE_FEATURE_START_STOP_DAEMON_FANCY("ovN:R:"),
 		&startas, &cmdname, &signame, &userspec, &chuid, &execname, &pidfile
 		USE_FEATURE_START_STOP_DAEMON_FANCY(,&opt_N)
-//		USE_FEATURE_START_STOP_DAEMON_FANCY(,&retry_arg)
+		/* We accept and ignore -R <param> / --retry <param> */
+		USE_FEATURE_START_STOP_DAEMON_FANCY(,NULL)
 	);
 
 	if (opt & OPT_s) {