[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 7c9ea61..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


@@ -43,6 +43,18 @@ config BUSYBOX_CONFIG_KILLALL5
        default y
        depends on BUSYBOX_CONFIG_KILL
 
        default y
        depends on BUSYBOX_CONFIG_KILL
 

+config BUSYBOX_CONFIG_NMETER
+       bool "nmeter"
+       default n
+       help
+         Prints selected system stats continuously, one line per update.
+
+config BUSYBOX_CONFIG_PGREP
+       bool "pgrep"
+       default y
+       help
+         Look for processes by name.
+

 config BUSYBOX_CONFIG_PIDOF
        bool "pidof"
        default y
 config BUSYBOX_CONFIG_PIDOF
        bool "pidof"
        default y


@@ -66,6 +78,12 @@ config BUSYBOX_CONFIG_FEATURE_PIDOF_OMIT
          The special pid %PPID can be used to name the parent process
          of the pidof, in other words the calling shell or shell script.
 
          The special pid %PPID can be used to name the parent process
          of the pidof, in other words the calling shell or shell script.
 

+config BUSYBOX_CONFIG_PKILL
+       bool "pkill"
+       default y
+       help
+         Send signals to processes by name.
+

 config BUSYBOX_CONFIG_PS
        bool "ps"
        default y
 config BUSYBOX_CONFIG_PS
        bool "ps"
        default y


@@ -73,13 +91,35 @@ 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"
+       default n
+       depends on BUSYBOX_CONFIG_PS && BUSYBOX_CONFIG_DESKTOP
+       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
+       depends on BUSYBOX_CONFIG_FEATURE_PS_TIME
+       help
+         Include support for measuring HZ on old kernels and non-ELF systems
+         (if you are on Linux 2.4.0+ and use ELF, you don't need this)

 
 config BUSYBOX_CONFIG_RENICE
        bool "renice"
 
 config BUSYBOX_CONFIG_RENICE
        bool "renice"


@@ -102,11 +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 "Support showing CPU usage percentage (add 2k bytes)"
+       bool "Show CPU per-process usage percentage"

        default y
        depends on BUSYBOX_CONFIG_TOP
        help
        default y
        depends on BUSYBOX_CONFIG_TOP
        help

-         Make top display CPU usage.
+         Make top display CPU usage for each process.
+         This adds about 2k.
+
+config BUSYBOX_CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS
+       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.
+         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
+       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.
+         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
+       bool "Topmem command ('s' key)"
+       default n
+       depends on BUSYBOX_CONFIG_TOP
+       help
+         Enable 's' in top (gives lots of memory info).

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


@@ -116,6 +196,12 @@ config BUSYBOX_CONFIG_UPTIME
          the system has been running, how many users are currently logged
          on, and the system load averages for the past 1, 5, and 15 minutes.
 
          the system has been running, how many users are currently logged
          on, and the system load averages for the past 1, 5, and 15 minutes.
 

+config BUSYBOX_CONFIG_WATCH
+       bool "watch"
+       default n
+       help
+         watch is used to execute a program periodically, showing
+         output to the screen.

 
 

-endmenu

 
 

+endmenu