diff options
author | Kang-Che Sung <explorer09@gmail.com> | 2017-08-19 14:18:27 +0800 |
---|---|---|
committer | Denys Vlasenko <vda.linux@googlemail.com> | 2017-08-22 11:00:32 +0200 |
commit | 753c4045e4f287fc4b4788afd94f58738a7f04b4 (patch) | |
tree | b989d84db70de77ca9b23ad56933d6d6fa466aba | |
parent | bbc26c6934fac218e19c7897f2dc2e6084e963b0 (diff) | |
download | busybox-w32-753c4045e4f287fc4b4788afd94f58738a7f04b4.tar.gz busybox-w32-753c4045e4f287fc4b4788afd94f58738a7f04b4.tar.bz2 busybox-w32-753c4045e4f287fc4b4788afd94f58738a7f04b4.zip |
ps: allow ps config options if minips is enabled
Follow-up of commit ab77e81a8527fa11a4f9392d97c2da037d6f4f98
"klibc-utils: new applets: resume, nuke, minips"
Also put FEATURE_PS_UNUSUAL_SYSTEMS to under FEATURE_PS_TIME in the
menu.
Signed-off-by: Kang-Che Sung <explorer09@gmail.com>
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
-rw-r--r-- | procps/ps.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/procps/ps.c b/procps/ps.c index 7edf6dbd1..fe2d8c294 100644 --- a/procps/ps.c +++ b/procps/ps.c | |||
@@ -17,7 +17,7 @@ | |||
17 | //config:config FEATURE_PS_WIDE | 17 | //config:config FEATURE_PS_WIDE |
18 | //config: bool "Enable wide output (-w)" | 18 | //config: bool "Enable wide output (-w)" |
19 | //config: default y | 19 | //config: default y |
20 | //config: depends on PS && !DESKTOP | 20 | //config: depends on (PS || MINIPS) && !DESKTOP |
21 | //config: help | 21 | //config: help |
22 | //config: Support argument 'w' for wide output. | 22 | //config: Support argument 'w' for wide output. |
23 | //config: If given once, 132 chars are printed, and if given more | 23 | //config: If given once, 132 chars are printed, and if given more |
@@ -26,7 +26,7 @@ | |||
26 | //config:config FEATURE_PS_LONG | 26 | //config:config FEATURE_PS_LONG |
27 | //config: bool "Enable long output (-l)" | 27 | //config: bool "Enable long output (-l)" |
28 | //config: default y | 28 | //config: default y |
29 | //config: depends on PS && !DESKTOP | 29 | //config: depends on (PS || MINIPS) && !DESKTOP |
30 | //config: help | 30 | //config: help |
31 | //config: Support argument 'l' for long output. | 31 | //config: Support argument 'l' for long output. |
32 | //config: Adds fields PPID, RSS, START, TIME & TTY | 32 | //config: Adds fields PPID, RSS, START, TIME & TTY |
@@ -34,14 +34,9 @@ | |||
34 | //config:config FEATURE_PS_TIME | 34 | //config:config FEATURE_PS_TIME |
35 | //config: bool "Enable -o time and -o etime specifiers" | 35 | //config: bool "Enable -o time and -o etime specifiers" |
36 | //config: default y | 36 | //config: default y |
37 | //config: depends on PS && DESKTOP | 37 | //config: depends on (PS || MINIPS) && DESKTOP |
38 | //config: select PLATFORM_LINUX | 38 | //config: select PLATFORM_LINUX |
39 | //config: | 39 | //config: |
40 | //config:config FEATURE_PS_ADDITIONAL_COLUMNS | ||
41 | //config: bool "Enable -o rgroup, -o ruser, -o nice specifiers" | ||
42 | //config: default y | ||
43 | //config: depends on PS && DESKTOP | ||
44 | //config: | ||
45 | //config:config FEATURE_PS_UNUSUAL_SYSTEMS | 40 | //config:config FEATURE_PS_UNUSUAL_SYSTEMS |
46 | //config: bool "Support Linux prior to 2.4.0 and non-ELF systems" | 41 | //config: bool "Support Linux prior to 2.4.0 and non-ELF systems" |
47 | //config: default n | 42 | //config: default n |
@@ -49,6 +44,11 @@ | |||
49 | //config: help | 44 | //config: help |
50 | //config: Include support for measuring HZ on old kernels and non-ELF systems | 45 | //config: Include support for measuring HZ on old kernels and non-ELF systems |
51 | //config: (if you are on Linux 2.4.0+ and use ELF, you don't need this) | 46 | //config: (if you are on Linux 2.4.0+ and use ELF, you don't need this) |
47 | //config: | ||
48 | //config:config FEATURE_PS_ADDITIONAL_COLUMNS | ||
49 | //config: bool "Enable -o rgroup, -o ruser, -o nice specifiers" | ||
50 | //config: default y | ||
51 | //config: depends on (PS || MINIPS) && DESKTOP | ||
52 | 52 | ||
53 | // APPLET_NOEXEC:name main location suid_type help | 53 | // APPLET_NOEXEC:name main location suid_type help |
54 | //applet:IF_PS( APPLET_NOEXEC(ps, ps, BB_DIR_BIN, BB_SUID_DROP, ps)) | 54 | //applet:IF_PS( APPLET_NOEXEC(ps, ps, BB_DIR_BIN, BB_SUID_DROP, ps)) |