* add --nicelevel to Config.in
* --retry doesn't exist anymore, just comment it out as it is already
done at the other places
* usage: --verbose is the fancy option, not --quiet
---
debianutils/Config.in | 1 +
debianutils/start_stop_daemon.c | 6 +++---
include/usage.h | 8 ++++----
3 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/debianutils/Config.in b/debianutils/Config.in
index 4ed00dd..8deb38f 100644
--- a/debianutils/Config.in
+++ b/debianutils/Config.in
@@ -64,6 +64,7 @@ config FEATURE_START_STOP_DAEMON_FANCY
Support additional arguments.
-o|--oknodo ignored since we exit with 0 anyway
-v|--verbose
+ -N|--nicelevel N
config FEATURE_START_STOP_DAEMON_LONG_OPTIONS
bool "Enable long options"
diff --git a/debianutils/start_stop_daemon.c b/debianutils/start_stop_daemon.c
index 99864d0..9b61cce 100644
--- a/debianutils/start_stop_daemon.c
+++ b/debianutils/start_stop_daemon.c
@@ -313,9 +313,9 @@ static const char start_stop_daemon_longopts[] ALIGN1 =
"chuid\0" Required_argument "c"
"exec\0" Required_argument "x"
"pidfile\0" Required_argument "p"
-#if ENABLE_FEATURE_START_STOP_DAEMON_FANCY
- "retry\0" Required_argument "R"
-#endif
+//#if ENABLE_FEATURE_START_STOP_DAEMON_FANCY
+// "retry\0" Required_argument "R"
+//#endif
;
#endif
diff --git a/include/usage.h b/include/usage.h
index ac6376a..37b3a8b 100644
--- a/include/usage.h
+++ b/include/usage.h
@@ -3728,10 +3728,10 @@
"\nOther:" \
USE_FEATURE_START_STOP_DAEMON_FANCY( \
"\n -o,--oknodo Exit with status 0 if nothing is done" \
- "\n -q,--quiet Quiet" \
- ) \
"\n -v,--verbose Verbose" \
) \
+ "\n -q,--quiet Quiet" \
+ ) \
SKIP_FEATURE_START_STOP_DAEMON_LONG_OPTIONS( \
"\nProcess matching:" \
"\n -u USERNAME|UID Match only this user's processes" \
@@ -3756,10 +3756,10 @@
"\nOther:" \
USE_FEATURE_START_STOP_DAEMON_FANCY( \
"\n -o Exit with status 0 if nothing is done" \
- "\n -q Quiet" \
- ) \
"\n -v Verbose" \
) \
+ "\n -q Quiet" \
+ ) \
#define stat_trivial_usage \
"[OPTION] FILE..."
--
1.5.6.4
_______________________________________________
busybox mailing list
[email protected]
http://busybox.net/cgi-bin/mailman/listinfo/busybox
