diff options
| author | Ron Yorston <rmy@pobox.com> | 2017-02-08 20:09:29 +0000 |
|---|---|---|
| committer | Ron Yorston <rmy@pobox.com> | 2017-02-08 20:09:29 +0000 |
| commit | 373275a708bafb88fa4f0519de2166154f44fed9 (patch) | |
| tree | 4587b4fd3f695e0f3705b2a217e199f3144df931 /debianutils | |
| parent | b74b2619779b1deb903b7766261807df1e9b1f7f (diff) | |
| parent | c2b18583a3df06aeecf535c3cea6856aa1f2e205 (diff) | |
| download | busybox-w32-373275a708bafb88fa4f0519de2166154f44fed9.tar.gz busybox-w32-373275a708bafb88fa4f0519de2166154f44fed9.tar.bz2 busybox-w32-373275a708bafb88fa4f0519de2166154f44fed9.zip | |
Merge branch 'busybox' into merge
Diffstat (limited to 'debianutils')
| -rw-r--r-- | debianutils/run_parts.c | 2 | ||||
| -rw-r--r-- | debianutils/start_stop_daemon.c | 13 |
2 files changed, 5 insertions, 10 deletions
diff --git a/debianutils/run_parts.c b/debianutils/run_parts.c index 0bb666abc..3ef28f1d4 100644 --- a/debianutils/run_parts.c +++ b/debianutils/run_parts.c | |||
| @@ -41,8 +41,6 @@ | |||
| 41 | //config: bool "Enable long options" | 41 | //config: bool "Enable long options" |
| 42 | //config: default y | 42 | //config: default y |
| 43 | //config: depends on RUN_PARTS && LONG_OPTS | 43 | //config: depends on RUN_PARTS && LONG_OPTS |
| 44 | //config: help | ||
| 45 | //config: Support long options for the run-parts applet. | ||
| 46 | //config: | 44 | //config: |
| 47 | //config:config FEATURE_RUN_PARTS_FANCY | 45 | //config:config FEATURE_RUN_PARTS_FANCY |
| 48 | //config: bool "Support additional arguments" | 46 | //config: bool "Support additional arguments" |
diff --git a/debianutils/start_stop_daemon.c b/debianutils/start_stop_daemon.c index 3625ffee8..4a9e0653e 100644 --- a/debianutils/start_stop_daemon.c +++ b/debianutils/start_stop_daemon.c | |||
| @@ -64,22 +64,19 @@ Misc options: | |||
| 64 | //config: termination of system-level processes, usually the ones | 64 | //config: termination of system-level processes, usually the ones |
| 65 | //config: started during the startup of the system. | 65 | //config: started during the startup of the system. |
| 66 | //config: | 66 | //config: |
| 67 | //config:config FEATURE_START_STOP_DAEMON_LONG_OPTIONS | ||
| 68 | //config: bool "Enable long options" | ||
| 69 | //config: default y | ||
| 70 | //config: depends on START_STOP_DAEMON && LONG_OPTS | ||
| 71 | //config: | ||
| 67 | //config:config FEATURE_START_STOP_DAEMON_FANCY | 72 | //config:config FEATURE_START_STOP_DAEMON_FANCY |
| 68 | //config: bool "Support additional arguments" | 73 | //config: bool "Support additional arguments" |
| 69 | //config: default y | 74 | //config: default y |
| 70 | //config: depends on START_STOP_DAEMON | 75 | //config: depends on START_STOP_DAEMON |
| 71 | //config: help | 76 | //config: help |
| 72 | //config: Support additional arguments. | ||
| 73 | //config: -o|--oknodo ignored since we exit with 0 anyway | 77 | //config: -o|--oknodo ignored since we exit with 0 anyway |
| 74 | //config: -v|--verbose | 78 | //config: -v|--verbose |
| 75 | //config: -N|--nicelevel N | 79 | //config: -N|--nicelevel N |
| 76 | //config: | ||
| 77 | //config:config FEATURE_START_STOP_DAEMON_LONG_OPTIONS | ||
| 78 | //config: bool "Enable long options" | ||
| 79 | //config: default y | ||
| 80 | //config: depends on START_STOP_DAEMON && LONG_OPTS | ||
| 81 | //config: help | ||
| 82 | //config: Support long options for the start-stop-daemon applet. | ||
| 83 | 80 | ||
| 84 | //applet:IF_START_STOP_DAEMON(APPLET_ODDNAME(start-stop-daemon, start_stop_daemon, BB_DIR_SBIN, BB_SUID_DROP, start_stop_daemon)) | 81 | //applet:IF_START_STOP_DAEMON(APPLET_ODDNAME(start-stop-daemon, start_stop_daemon, BB_DIR_SBIN, BB_SUID_DROP, start_stop_daemon)) |
| 85 | 82 | ||