X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=blobdiff_plain;f=package%2Futils%2Fbusybox%2Fconfig%2Fprocps%2FConfig.in;h=acd4ed882b431b43f8a58f39604f8fd8ced4ef65;hp=6bc5ec058aff5b14a6da896e327ca4d593b0ec08;hb=89f8a01daba938e77e94ef311233be49c23a7a55;hpb=9adfeccd8415ed7e999855539a5fca9bfc9a3e4b

diff --git a/package/utils/busybox/config/procps/Config.in b/package/utils/busybox/config/procps/Config.in
index 6bc5ec058a..acd4ed882b 100644
--- a/package/utils/busybox/config/procps/Config.in
+++ b/package/utils/busybox/config/procps/Config.in
@@ -85,18 +85,18 @@ config BUSYBOX_CONFIG_PIDOF
 	  those id's on the standard output.
 
 config BUSYBOX_CONFIG_FEATURE_PIDOF_SINGLE
-	bool "Enable argument for single shot (-s)"
+	bool "Enable single shot (-s)"
 	default BUSYBOX_DEFAULT_FEATURE_PIDOF_SINGLE
 	depends on BUSYBOX_CONFIG_PIDOF
 	help
-	  Support argument '-s' for returning only the first pid found.
+	  Support '-s' for returning only the first pid found.
 
 config BUSYBOX_CONFIG_FEATURE_PIDOF_OMIT
-	bool "Enable argument for omitting pids (-o)"
+	bool "Enable omitting pids (-o PID)"
 	default BUSYBOX_DEFAULT_FEATURE_PIDOF_OMIT
 	depends on BUSYBOX_CONFIG_PIDOF
 	help
-	  Support argument '-o' for omitting the given pids in output.
+	  Support '-o PID' for omitting the given pid(s) in output.
 	  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_PMAP
@@ -109,6 +109,14 @@ config BUSYBOX_CONFIG_POWERTOP
 	default BUSYBOX_DEFAULT_POWERTOP
 	help
 	  Analyze power consumption on Intel-based laptops
+
+config BUSYBOX_CONFIG_FEATURE_POWERTOP_INTERACTIVE
+	bool "Accept keyboard commands"
+	default BUSYBOX_DEFAULT_FEATURE_POWERTOP_INTERACTIVE
+	depends on BUSYBOX_CONFIG_POWERTOP
+	help
+	  Without this, powertop will only refresh display every 10 seconds.
+	  No keyboard commands will work, only ^C to terminate.
 config BUSYBOX_CONFIG_PS
 	bool "ps"
 	default BUSYBOX_DEFAULT_PS
@@ -133,19 +141,10 @@ config BUSYBOX_CONFIG_FEATURE_PS_LONG
 	  Adds fields PPID, RSS, START, TIME & TTY
 
 config BUSYBOX_CONFIG_FEATURE_PS_TIME
-	bool "Enable time and elapsed time output"
+	bool "Support -o time and -o etime output specifiers"
 	default BUSYBOX_DEFAULT_FEATURE_PS_TIME
 	depends on BUSYBOX_CONFIG_PS && BUSYBOX_CONFIG_DESKTOP
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
-	help
-	  Support -o time and -o etime output specifiers.
-
-config BUSYBOX_CONFIG_FEATURE_PS_ADDITIONAL_COLUMNS
-	bool "Enable additional ps columns"
-	default BUSYBOX_DEFAULT_FEATURE_PS_ADDITIONAL_COLUMNS
-	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"
@@ -154,6 +153,11 @@ config BUSYBOX_CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS
 	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_FEATURE_PS_ADDITIONAL_COLUMNS
+	bool "Support -o rgroup, -o ruser, -o nice specifiers"
+	default BUSYBOX_DEFAULT_FEATURE_PS_ADDITIONAL_COLUMNS
+	depends on BUSYBOX_CONFIG_PS && BUSYBOX_CONFIG_DESKTOP
 config BUSYBOX_CONFIG_PSTREE
 	bool "pstree"
 	default BUSYBOX_DEFAULT_PSTREE
@@ -164,12 +168,6 @@ config BUSYBOX_CONFIG_PWDX
 	default BUSYBOX_DEFAULT_PWDX
 	help
 	  Report current working directory of a process
-config BUSYBOX_CONFIG_RENICE
-	bool "renice"
-	default BUSYBOX_DEFAULT_RENICE
-	help
-	  Renice alters the scheduling priority of one or more running
-	  processes.
 config BUSYBOX_CONFIG_SMEMCAP
 	bool "smemcap"
 	default BUSYBOX_DEFAULT_SMEMCAP
@@ -188,6 +186,14 @@ config BUSYBOX_CONFIG_TOP
 	  The top program provides a dynamic real-time view of a running
 	  system.
 
+config BUSYBOX_CONFIG_FEATURE_TOP_INTERACTIVE
+	bool "Accept keyboard commands"
+	default BUSYBOX_DEFAULT_FEATURE_TOP_INTERACTIVE
+	depends on BUSYBOX_CONFIG_TOP
+	help
+	  Without this, top will only refresh display every 5 seconds.
+	  No keyboard commands will work, only ^C to terminate.
+
 config BUSYBOX_CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE
 	bool "Show CPU per-process usage percentage"
 	default BUSYBOX_DEFAULT_FEATURE_TOP_CPU_USAGE_PERCENTAGE
@@ -244,11 +250,11 @@ config BUSYBOX_CONFIG_UPTIME
 	  on, and the system load averages for the past 1, 5, and 15 minutes.
 
 config BUSYBOX_CONFIG_FEATURE_UPTIME_UTMP_SUPPORT
-	bool "Support for showing the number of users"
+	bool "Show the number of users"
 	default BUSYBOX_DEFAULT_FEATURE_UPTIME_UTMP_SUPPORT
 	depends on BUSYBOX_CONFIG_UPTIME && BUSYBOX_CONFIG_FEATURE_UTMP
 	help
-	  Makes uptime display the number of users currently logged on.
+	  Display the number of users currently logged on.
 config BUSYBOX_CONFIG_WATCH
 	bool "watch"
 	default BUSYBOX_DEFAULT_WATCH
@@ -257,7 +263,7 @@ config BUSYBOX_CONFIG_WATCH
 	  output to the screen.
 
 config BUSYBOX_CONFIG_FEATURE_SHOW_THREADS
-	bool "Support for showing threads in ps/pstree/top"
+	bool "Support thread display in ps/pstree/top"
 	default BUSYBOX_DEFAULT_FEATURE_SHOW_THREADS
 	depends on BUSYBOX_CONFIG_PS || BUSYBOX_CONFIG_TOP || BUSYBOX_CONFIG_PSTREE
 	help