update busybox and default config

1 files changed, 115 insertions, 38 deletions

diff --git a/package/busybox/config/miscutils/Config.in b/package/busybox/config/miscutils/Config.in
index d5912c6d6..eeb0d6d34 100644
--- a/package/busybox/config/miscutils/Config.in
+++ b/package/busybox/config/miscutils/Config.in
@@ -19,6 +19,28 @@ config BUSYBOX_BBCONFIG
 	  The bbconfig applet will print the config file with which
 	  busybox was built.
 
+config BUSYBOX_BEEP
+	bool "beep"
+	default n
+	help
+	  The beep applets beeps in a given freq/Hz.
+
+config BUSYBOX_FEATURE_BEEP_FREQ
+	int "default frequency"
+	range 0 2147483647
+	default 4000
+	depends on BUSYBOX_BEEP
+	help
+	  Frequency for default beep.
+
+config BUSYBOX_FEATURE_BEEP_LENGTH_MS
+	int "default length"
+	range 0 2147483647
+	default 30
+	depends on BUSYBOX_BEEP
+	help
+	  Length in ms for default beep.
+
 config BUSYBOX_CHAT
 	bool "chat"
 	default n
@@ -95,7 +117,7 @@ config BUSYBOX_CHRT
 
 config BUSYBOX_CROND
 	bool "crond"
-	default y
+	default n
 	select BUSYBOX_FEATURE_SUID
 	select BUSYBOX_FEATURE_SYSLOG
 	help
@@ -121,9 +143,16 @@ config BUSYBOX_FEATURE_CROND_CALL_SENDMAIL
 	help
 	  Support calling /usr/sbin/sendmail for send cmd outputs.
 
+config BUSYBOX_FEATURE_CROND_DIR
+	string "crond spool directory"
+	default "/var/spool/cron"
+	depends on BUSYBOX_CROND || BUSYBOX_CRONTAB
+	help
+	  Location of crond spool.
+
 config BUSYBOX_CRONTAB
 	bool "crontab"
-	default y
+	default n
 	select BUSYBOX_FEATURE_SUID
 	help
 	  Crontab manipulates the crontab for a particular user. Only
@@ -151,7 +180,10 @@ config BUSYBOX_DEVFSD
 	default n
 	select BUSYBOX_FEATURE_SYSLOG
 	help
-	  This is deprecated, and will be removed at the end of 2008.
+	  This is deprecated and should NOT be used anymore.
+	  Use linux >= 2.6 (optionally with hotplug) and mdev instead!
+	  See docs/mdev.txt for detailed instructions on how to use mdev
+	  instead.
 
 	  Provides compatibility with old device names on a devfs systems.
 	  You should set it to true if you have devfs enabled.
@@ -160,7 +192,7 @@ config BUSYBOX_DEVFSD
 	  "PERMISSIONS", "EXECUTE", "COPY", "IGNORE",
 	  "MKOLDCOMPAT", "MKNEWCOMPAT","RMOLDCOMPAT", "RMNEWCOMPAT".
 
-	   But only if they are written UPPERCASE!!!!!!!!
+	  But only if they are written UPPERCASE!!!!!!!!
 
 config BUSYBOX_DEVFSD_MODLOAD
 	bool "Adds support for MODLOAD keyword in devsfd.conf"
@@ -190,9 +222,11 @@ config BUSYBOX_FEATURE_DEVFS
 	bool "Use devfs names for all devices (obsolete)"
 	default n
 	help
-	  This is obsolete and will be going away at the end of 2008..
+	  This is obsolete and should NOT be used anymore.
+	  Use linux >= 2.6 (optionally with hotplug) and mdev instead!
 
-	  This tells busybox to look for names like /dev/loop/0 instead of
+	  For legacy systems -- if there is no way around devfsd -- this
+	  tells busybox to look for names like /dev/loop/0 instead of
 	  /dev/loop0. If your /dev directory has normal names instead of
 	  devfs names, you don't want this.
 
@@ -238,6 +272,34 @@ config BUSYBOX_FBSPLASH
 	    "NN" (ASCII decimal number) - percentage to show on progress bar
 	    "exit" - well you guessed it
 
+config BUSYBOX_FLASH_LOCK
+	bool "flash_lock"
+	default n
+	help
+	  The flash_lock binary from mtd-utils as of git head 5ec0c10d0. This
+	  utility locks part or all of the flash device.
+
+config BUSYBOX_FLASH_UNLOCK
+	bool "flash_unlock"
+	default n
+	help
+	  The flash_unlock binary from mtd-utils as of git head 5ec0c10d0. This
+	  utility unlocks part or all of the flash device.
+
+config BUSYBOX_FLASH_ERASEALL
+	bool "flash_eraseall"
+	default n
+	help
+	  The flash_eraseall binary from mtd-utils as of git head c4c6a59eb.
+	  This utility is used to erase the whole MTD device.
+
+config BUSYBOX_IONICE
+	bool "ionice"
+	default n
+	help
+	  Set/set program io scheduling class and priority
+	  Requires kernel >= 2.6.13
+
 config BUSYBOX_INOTIFYD
 	bool "inotifyd"
 	default n
@@ -273,6 +335,7 @@ endchoice
 config BUSYBOX_LESS
 	bool "less"
 	default y
+	depends on !ADK_PACKAGE_LESS
 	help
 	  'less' is a pager, meaning that it displays text files. It possesses
 	  a wide array of features, and is an improvement over 'more'.
@@ -300,14 +363,6 @@ config BUSYBOX_FEATURE_LESS_FLAGS
 	  The -M flag enables a more sophisticated status line.
 	  The -m flag enables a simpler status line with a percentage.
 
-config BUSYBOX_FEATURE_LESS_DASHCMD
-	bool "Enable flag changes ('-' command)"
-	default n
-	depends on BUSYBOX_LESS
-	help
-	  This enables the ability to change command-line flags within
-	  less itself ('-' keyboard command).
-
 config BUSYBOX_FEATURE_LESS_MARKS
 	bool "Enable marks"
 	default n
@@ -322,6 +377,21 @@ config BUSYBOX_FEATURE_LESS_REGEXP
 	help
 	  Enable regular expressions, allowing complex file searches.
 
+config BUSYBOX_FEATURE_LESS_WINCH
+	bool "Enable automatic resizing on window size changes"
+	default n
+	depends on BUSYBOX_LESS
+	help
+	  Makes less track window size changes.
+
+config BUSYBOX_FEATURE_LESS_DASHCMD
+	bool "Enable flag changes ('-' command)"
+	default n
+	depends on BUSYBOX_LESS
+	help
+	  This enables the ability to change command-line flags within
+	  less itself ('-' keyboard command).
+
 config BUSYBOX_FEATURE_LESS_LINENUMS
 	bool "Enable dynamic switching of line numbers"
 	default n
@@ -329,15 +399,9 @@ config BUSYBOX_FEATURE_LESS_LINENUMS
 	help
 	  Enable "-N" command.
 
-config BUSYBOX_FEATURE_LESS_WINCH
-	bool "Enable automatic resizing on window size changes"
-	default y
-	depends on BUSYBOX_LESS
-	help
-	  Makes less track window size changes.
-
 config BUSYBOX_HDPARM
 	bool "hdparm"
+	depends on !ADK_PACKAGE_HDPARM
 	default n
 	help
 	  Get/Set hard drive parameters. Primarily intended for ATA
@@ -388,12 +452,11 @@ config BUSYBOX_FEATURE_HDPARM_HDIO_TRISTATE_HWIF
 	  stuff, so you should probably say N.
 
 config BUSYBOX_FEATURE_HDPARM_HDIO_GETSET_DMA
-	bool "Get/set using_dma flag (DANGEROUS)"
+	bool "Get/set using_dma flag"
 	default n
 	depends on BUSYBOX_HDPARM
 	help
 	  Enables the 'hdparm -d' option to get/set using_dma flag.
-	  This is dangerous stuff, so you should probably say N.
 
 config BUSYBOX_MAKEDEVS
 	bool "makedevs"
@@ -505,21 +568,21 @@ config BUSYBOX_STRINGS
 	  strings prints the printable character sequences for each file
 	  specified.
 
-#config BUSYBOX_TASKSET
-#	bool "taskset"
-#	default n
-#	help
-#	  Retrieve or set a processes's CPU affinity.
-#	  This requires sched_{g,s}etaffinity support in your libc.
-
-#config BUSYBOX_FEATURE_TASKSET_FANCY
-#	bool "Fancy output"
-#	default y
-#	depends on BUSYBOX_TASKSET
-#	help
-#	  Add code for fancy output. This merely silences a compiler-warning
-#	  and adds about 135 Bytes. May be needed for machines with alot
-#	  of CPUs.
+config BUSYBOX_TASKSET
+	bool "taskset"
+	default n
+	help
+	  Retrieve or set a processes's CPU affinity.
+	  This requires sched_{g,s}etaffinity support in your libc.
+
+config BUSYBOX_FEATURE_TASKSET_FANCY
+	bool "Fancy output"
+	default y
+	depends on BUSYBOX_TASKSET
+	help
+	  Add code for fancy output. This merely silences a compiler-warning
+	  and adds about 135 Bytes. May be needed for machines with alot
+	  of CPUs.
 
 config BUSYBOX_TIME
 	bool "time"
@@ -529,6 +592,13 @@ config BUSYBOX_TIME
 	  When the command finishes, time writes a message to standard output
 	  giving timing statistics about this program run.
 
+config BUSYBOX_TIMEOUT
+	bool "timeout"
+	default n
+	help
+	  Runs a program and watches it. If it does not terminate in
+	  specified number of seconds, it is sent a signal.
+
 config BUSYBOX_TTYSIZE
 	bool "ttysize"
 	default n
@@ -538,8 +608,15 @@ config BUSYBOX_TTYSIZE
 	  error, but returns default 80x24.
 	  Usage in shell scripts: width=`ttysize w`.
 
+config BUSYBOX_VOLNAME
+	bool "volname"
+	default n
+	help
+	  Prints a CD-ROM volume name.
+
 config BUSYBOX_WATCHDOG
 	bool "watchdog"
+	depends on !ADK_PACKAGE_WATCHDOG
 	default n
 	help
 	  The watchdog utility is used with hardware or software watchdog