[package] dnsmasq: remove redundant code introduced with r20074

[openwrt.git] / package / busybox / config / procps / Config.in

diff --git a/package/busybox/config/procps/Config.in b/package/busybox/config/procps/Config.in
index f650f52..bd21cb3 100644 (file)
--- a/package/busybox/config/procps/Config.in
+++ b/package/busybox/config/procps/Config.in
@@ -18,7 +18,7 @@ config BUSYBOX_CONFIG_FUSER
        default n
        help
          fuser lists all PIDs (Process IDs) that currently have a given
        default n
        help
          fuser lists all PIDs (Process IDs) that currently have a given

-         file open.  fuser can also list all PIDs that have a given network
+         file open. fuser can also list all PIDs that have a given network

          (TCP or UDP) port open.
 
 config BUSYBOX_CONFIG_KILL
          (TCP or UDP) port open.
 
 config BUSYBOX_CONFIG_KILL


@@ -26,7 +26,7 @@ config BUSYBOX_CONFIG_KILL
        default y
        help
          The command kill sends the specified signal to the specified
        default y
        help
          The command kill sends the specified signal to the specified

-         process or process group.  If no signal is specified, the TERM
+         process or process group. If no signal is specified, the TERM

          signal is sent.
 
 config BUSYBOX_CONFIG_KILLALL
          signal is sent.
 
 config BUSYBOX_CONFIG_KILLALL


@@ -35,7 +35,7 @@ config BUSYBOX_CONFIG_KILLALL
        depends on BUSYBOX_CONFIG_KILL
        help
          killall sends a signal to all processes running any of the
        depends on BUSYBOX_CONFIG_KILL
        help
          killall sends a signal to all processes running any of the

-         specified commands.  If no signal name is specified, SIGTERM is
+         specified commands. If no signal name is specified, SIGTERM is

          sent.
 
 config BUSYBOX_CONFIG_KILLALL5
          sent.
 
 config BUSYBOX_CONFIG_KILLALL5


@@ -91,13 +91,13 @@ config BUSYBOX_CONFIG_PS
          ps gives a snapshot of the current processes.
 
 config BUSYBOX_CONFIG_FEATURE_PS_WIDE
          ps gives a snapshot of the current processes.
 
 config BUSYBOX_CONFIG_FEATURE_PS_WIDE

-       bool "Enable argument for wide output (-w)"
+       bool "Enable wide output option (-w)"

        default n
        depends on BUSYBOX_CONFIG_PS
        help
          Support argument 'w' for wide output.
        default n
        depends on BUSYBOX_CONFIG_PS
        help
          Support argument 'w' for wide output.

-         If given once, 132 chars are printed and given more than
-         one, the length is unlimited.
+         If given once, 132 chars are printed, and if given more
+         than once, the length is unlimited.

 
 config BUSYBOX_CONFIG_FEATURE_PS_TIME
        bool "Enable time and elapsed time output"
 
 config BUSYBOX_CONFIG_FEATURE_PS_TIME
        bool "Enable time and elapsed time output"


@@ -106,6 +106,13 @@ config BUSYBOX_CONFIG_FEATURE_PS_TIME
        help
          Support -o time and -o etime output specifiers.
 
        help
          Support -o time and -o etime output specifiers.
 

+config BUSYBOX_CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS
+       bool "Enable additional ps columns"
+       default n
+       depends on BUSYBOX_CONFIG_PS && BUSYBOX_CONFIG_DESKTOP
+       help
+         Support -o rgroup, -o ruser, -o nice output specifiers.
+

 config BUSYBOX_CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS
        bool "Support Linux prior to 2.4.0 and non-ELF systems"
        default n
 config BUSYBOX_CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS
        bool "Support Linux prior to 2.4.0 and non-ELF systems"
        default n


@@ -135,32 +142,51 @@ config BUSYBOX_CONFIG_TOP
          system.
 
 config BUSYBOX_CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE
          system.
 
 config BUSYBOX_CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE

-       bool "Show CPU per-process usage percentage (adds 2k bytes)"
+       bool "Show CPU per-process usage percentage"

        default y
        depends on BUSYBOX_CONFIG_TOP
        help
          Make top display CPU usage for each process.
        default y
        depends on BUSYBOX_CONFIG_TOP
        help
          Make top display CPU usage for each process.

+         This adds about 2k.

 
 config BUSYBOX_CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS
 
 config BUSYBOX_CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS

-       bool "Show CPU global usage percentage (adds 0.5k bytes)"
+       bool "Show CPU global usage percentage"

        default y
        depends on BUSYBOX_CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE
        help
          Makes top display "CPU: NN% usr NN% sys..." line.
        default y
        depends on BUSYBOX_CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE
        help
          Makes top display "CPU: NN% usr NN% sys..." line.

+         This adds about 0.5k.
+
+config BUSYBOX_CONFIG_FEATURE_TOP_SMP_CPU
+       bool "SMP CPU usage display ('c' key)"
+       default n
+       depends on BUSYBOX_CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS
+       help
+         Allow 'c' key to switch between individual/cumulative CPU stats
+         This adds about 0.5k.

 
 config BUSYBOX_CONFIG_FEATURE_TOP_DECIMALS
 
 config BUSYBOX_CONFIG_FEATURE_TOP_DECIMALS

-       bool "Show 1/10th of a percent in CPU/mem statistics (adds 0.3k bytes)"
+       bool "Show 1/10th of a percent in CPU/mem statistics"

        default n
        depends on BUSYBOX_CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE
        help
          Show 1/10th of a percent in CPU/mem statistics.
        default n
        depends on BUSYBOX_CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE
        help
          Show 1/10th of a percent in CPU/mem statistics.

+         This adds about 0.3k.
+
+config BUSYBOX_CONFIG_FEATURE_TOP_SMP_PROCESS
+       bool "Show CPU process runs on ('j' field)"
+       default n
+       depends on BUSYBOX_CONFIG_TOP
+       help
+         Show CPU where process was last found running on.
+         This is the 'j' field.

 
 config BUSYBOX_CONFIG_FEATURE_TOPMEM
 
 config BUSYBOX_CONFIG_FEATURE_TOPMEM

-       bool "topmem"
+       bool "Topmem command ('s' key)"

        default n
        depends on BUSYBOX_CONFIG_TOP
        help
        default n
        depends on BUSYBOX_CONFIG_TOP
        help

-         Enable 's' in top (gives lots of memory info)
+         Enable 's' in top (gives lots of memory info).

 
 config BUSYBOX_CONFIG_UPTIME
        bool "uptime"
 
 config BUSYBOX_CONFIG_UPTIME
        bool "uptime"


@@ -173,11 +199,9 @@ config BUSYBOX_CONFIG_UPTIME
 config BUSYBOX_CONFIG_WATCH
        bool "watch"
        default n
 config BUSYBOX_CONFIG_WATCH
        bool "watch"
        default n

-       #huh?? select DATE

        help
          watch is used to execute a program periodically, showing
          output to the screen.
 
 
 endmenu
        help
          watch is used to execute a program periodically, showing
          output to the screen.
 
 
 endmenu

-