switch to busybox-1.10.0

git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@7862 33e552b5-05e3-0310-8538-816dae2090ed

17 files changed, 673 insertions, 141 deletions

diff --git a/config/busybox/Config.in b/config/busybox/Config.in
index d5b208310..1094a8646 100644
--- a/config/busybox/Config.in
+++ b/config/busybox/Config.in
@@ -113,7 +113,7 @@ config BB_CONFIG_LOCALE_SUPPORT
 	  busybox to support locale settings.
 
 config BB_CONFIG_GETOPT_LONG
-	bool "Enable support for --long-options"
+	bool "Support for --long-options"
 	default y
 	help
 	  Enable this if you want busybox applets to use the gnu --long-option
@@ -283,6 +283,17 @@ config BB_CONFIG_STATIC
 
 	  Most people will leave this set to 'N'.
 
+config BB_CONFIG_NOMMU
+	bool "Force NOMMU build"
+	default n
+	help
+	  Busybox tries to detect whether architecture it is being
+	  built against supports MMU or not. If this detection fails,
+	  or if you want to build NOMMU version of busybox for testing,
+	  you may force NOMMU build here.
+
+	  Most people will leave this set to 'N'.
+
 config BB_CONFIG_BUILD_LIBBUSYBOX
 	bool "Build shared libbusybox"
 	default n
@@ -560,4 +571,4 @@ source config/busybox/shell/Config.in
 source config/busybox/sysklogd/Config.in
 source config/busybox/runit/Config.in
 source config/busybox/selinux/Config.in
-source config/busybox/ipsvd/Config.in
+source config/busybox/printutils/Config.in
diff --git a/config/busybox/archival/Config.in b/config/busybox/archival/Config.in
index 900f24fb9..c01773834 100644
--- a/config/busybox/archival/Config.in
+++ b/config/busybox/archival/Config.in
@@ -30,7 +30,7 @@ config BB_CONFIG_AR
 	  probably say N here.
 
 config BB_CONFIG_FEATURE_AR_LONG_FILENAMES
-	bool "Enable support for long filenames (not need for debs)"
+	bool "Support for long filenames (not need for debs)"
 	default n
 	depends on BB_CONFIG_AR
 	help
@@ -100,7 +100,7 @@ config BB_CONFIG_DPKG_DEB
 	  probably say N here.
 
 config BB_CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY
-	bool "extract only (-x)"
+	bool "Extract only (-x)"
 	default n
 	depends on BB_CONFIG_DPKG_DEB
 	help
@@ -167,6 +167,14 @@ config BB_CONFIG_FEATURE_TAR_CREATE
 	  If you enable this option you'll be able to create
 	  tar archives using the `-c' option.
 
+config BB_CONFIG_FEATURE_TAR_GZIP
+	bool "Enable -z option"
+	default y
+	depends on BB_CONFIG_TAR
+	help
+	  If you enable this option tar will be able to call gzip,
+	  when creating or extracting tar gziped archives.
+
 config BB_CONFIG_FEATURE_TAR_BZIP2
 	bool "Enable -j option to handle .tar.bz2 files"
 	default n
@@ -183,32 +191,32 @@ config BB_CONFIG_FEATURE_TAR_LZMA
 	  If you enable this option you'll be able to extract
 	  archives compressed with lzma.
 
-config BB_CONFIG_FEATURE_TAR_FROM
-	bool "Enable -X (exclude from) and -T (include from) options)"
+config BB_CONFIG_FEATURE_TAR_COMPRESS
+	bool "Enable -Z option"
 	default n
 	depends on BB_CONFIG_TAR
 	help
-	  If you enable this option you'll be able to specify
-	  a list of files to include or exclude from an archive.
+	  If you enable this option tar will be able to call uncompress,
+	  when extracting .tar.Z archives.
 
-config BB_CONFIG_FEATURE_TAR_GZIP
-	bool "Enable -z option"
-	default y
-	depends on BB_CONFIG_TAR
+config BB_CONFIG_FEATURE_TAR_AUTODETECT
+	bool "Let tar autodetect gz/bz2 compresses tarballs"
+	default n
+	depends on BB_CONFIG_FEATURE_TAR_GZIP || BB_CONFIG_FEATURE_TAR_BZIP2
 	help
-	  If you enable this option tar will be able to call gzip,
-	  when creating or extracting tar gziped archives.
+	  With this option tar can automatically detect gzip/bzip2 compressed
+	  tarballs. Currently it works only on seekable streams.
 
-config BB_CONFIG_FEATURE_TAR_COMPRESS
-	bool "Enable -Z option"
+config BB_CONFIG_FEATURE_TAR_FROM
+	bool "Enable -X (exclude from) and -T (include from) options)"
 	default n
 	depends on BB_CONFIG_TAR
 	help
-	  If you enable this option tar will be able to call uncompress,
-	  when extracting .tar.Z archives.
+	  If you enable this option you'll be able to specify
+	  a list of files to include or exclude from an archive.
 
 config BB_CONFIG_FEATURE_TAR_OLDGNU_COMPATIBILITY
-	bool "Enable support for old tar header format"
+	bool "Support for old tar header format"
 	default N
 	depends on BB_CONFIG_TAR
 	help
@@ -226,7 +234,7 @@ config BB_CONFIG_FEATURE_TAR_OLDSUN_COMPATIBILITY
 	  It is said to be fixed in newer Sun tar, but "old" tarballs still exist.
 
 config BB_CONFIG_FEATURE_TAR_GNU_EXTENSIONS
-	bool "Enable support for some GNU tar extensions"
+	bool "Support for GNU tar extensions (long filenames)"
 	default y
 	depends on BB_CONFIG_TAR
 	help
@@ -238,7 +246,16 @@ config BB_CONFIG_FEATURE_TAR_LONG_OPTIONS
 	default n
 	depends on BB_CONFIG_TAR && BB_CONFIG_GETOPT_LONG
 	help
-		Enable use of long options, increases size by about 400 Bytes
+	  Enable use of long options, increases size by about 400 Bytes
+
+config BB_CONFIG_FEATURE_TAR_UNAME_GNAME
+	bool "Enable use of user and group names"
+	default n
+	depends on BB_CONFIG_TAR
+	help
+	  Enables use of user and group names in tar. This affects contents
+	  listings (-t) and preserving permissions when unpacking (-p).
+	  +200 bytes.
 
 config BB_CONFIG_UNCOMPRESS
 	bool "uncompress"
diff --git a/config/busybox/console-tools/Config.in b/config/busybox/console-tools/Config.in
index 0b85cdb21..0b40a0595 100644
--- a/config/busybox/console-tools/Config.in
+++ b/config/busybox/console-tools/Config.in
@@ -73,7 +73,7 @@ config BB_CONFIG_RESIZE
 	  terminal.
 
 config BB_CONFIG_FEATURE_RESIZE_PRINT
-	bool "print environment variables"
+	bool "Print environment variables"
 	default n
 	depends on BB_CONFIG_RESIZE
 	help
diff --git a/config/busybox/coreutils/Config.in b/config/busybox/coreutils/Config.in
index 90be19049..e60b713fc 100644
--- a/config/busybox/coreutils/Config.in
+++ b/config/busybox/coreutils/Config.in
@@ -489,6 +489,14 @@ config BB_CONFIG_RMDIR
 	help
 	  rmdir is used to remove empty directories.
 
+config BB_CONFIG_FEATURE_RMDIR_LONG_OPTIONS
+	bool "Enable long options"
+	default n
+	depends on BB_CONFIG_RMDIR && BB_CONFIG_GETOPT_LONG
+	help
+	  Support long options for the rmdir applet, including
+	  --ignore-fail-on-non-empty for compatibility with GNU rmdir.
+
 config BB_CONFIG_SEQ
 	bool "seq"
 	default n
@@ -521,7 +529,7 @@ config BB_CONFIG_SORT
 	  sort is used to sort lines of text in specified files.
 
 config BB_CONFIG_FEATURE_SORT_BIG
-	bool "full SuSv3 compliant sort (Support -ktcsbdfiozgM)"
+	bool "Full SuSv3 compliant sort (support -ktcsbdfiozgM)"
 	default y
 	depends on BB_CONFIG_SORT
 	help
@@ -539,7 +547,7 @@ config BB_CONFIG_SPLIT
 	  split a file into pieces.
 
 config BB_CONFIG_FEATURE_SPLIT_FANCY
-	bool "fancy extensions"
+	bool "Fancy extensions"
 	default n
 	depends on BB_CONFIG_SPLIT
 	help
@@ -580,6 +588,12 @@ config BB_CONFIG_SYNC
 	help
 	  sync is used to flush filesystem buffers.
 
+config BB_CONFIG_TAC
+	bool "tac"
+	default n
+	help
+	  tac is used to concatenate and print files in reverse.
+
 config BB_CONFIG_TAIL
 	bool "tail"
 	default n
@@ -603,7 +617,7 @@ config BB_CONFIG_TEE
 	  to standard output and files.
 
 config BB_CONFIG_FEATURE_TEE_USE_BLOCK_IO
-	bool "Enable block i/o (larger/faster) instead of byte i/o."
+	bool "Enable block I/O (larger/faster) instead of byte I/O"
 	default n
 	depends on BB_CONFIG_TEE
 	help
diff --git a/config/busybox/debianutils/Config.in b/config/busybox/debianutils/Config.in
index 72ed8d548..eaa971f37 100644
--- a/config/busybox/debianutils/Config.in
+++ b/config/busybox/debianutils/Config.in
@@ -51,7 +51,7 @@ config BB_CONFIG_FEATURE_RUN_PARTS_FANCY
 
 config BB_CONFIG_START_STOP_DAEMON
 	bool "start-stop-daemon"
-	default y
+	default n
 	help
 	  start-stop-daemon is used to control the creation and
 	  termination of system-level processes, usually the ones
@@ -59,7 +59,7 @@ config BB_CONFIG_START_STOP_DAEMON
 
 config BB_CONFIG_FEATURE_START_STOP_DAEMON_FANCY
 	bool "Support additional arguments"
-	default y
+	default n
 	depends on BB_CONFIG_START_STOP_DAEMON
 	help
 	  Support additional arguments.
diff --git a/config/busybox/e2fsprogs/Config.in b/config/busybox/e2fsprogs/Config.in
index 0e556ea07..dc5be1ea7 100644
--- a/config/busybox/e2fsprogs/Config.in
+++ b/config/busybox/e2fsprogs/Config.in
@@ -13,13 +13,13 @@ config BB_CONFIG_CHATTR
 	  chattr changes the file attributes on a second extended file system.
 
 ### config E2FSCK
-### 	bool "e2fsck"
-### 	default n
-### 	help
-### 	  e2fsck is used to check Linux second extended file systems (ext2fs).
-### 	  e2fsck also supports ext2 filesystems countaining a journal (ext3).
-### 	  The normal compat symlinks 'fsck.ext2' and 'fsck.ext3' are also
-### 	  provided.
+###	bool "e2fsck"
+###	default n
+###	help
+###	  e2fsck is used to check Linux second extended file systems (ext2fs).
+###	  e2fsck also supports ext2 filesystems countaining a journal (ext3).
+###	  The normal compat symlinks 'fsck.ext2' and 'fsck.ext3' are also
+###	  provided.
 
 config BB_CONFIG_FSCK
 	bool "fsck"
@@ -36,33 +36,34 @@ config BB_CONFIG_LSATTR
 	  lsattr lists the file attributes on a second extended file system.
 
 ### config MKE2FS
-### 	bool "mke2fs"
-### 	default n
-### 	help
-### 	  mke2fs is used to create an ext2/ext3 filesystem.  The normal compat
-### 	  symlinks 'mkfs.ext2' and 'mkfs.ext3' are also provided.
+###	bool "mke2fs"
+###	default n
+###	help
+###	  mke2fs is used to create an ext2/ext3 filesystem.  The normal compat
+###	  symlinks 'mkfs.ext2' and 'mkfs.ext3' are also provided.
 
 ### config TUNE2FS
-### 	bool "tune2fs"
-### 	default n
-### 	help
-### 	  tune2fs allows the system administrator to adjust various tunable
-### 	  filesystem parameters on Linux ext2/ext3 filesystems.
+###	bool "tune2fs"
+###	default n
+###	help
+###	  tune2fs allows the system administrator to adjust various tunable
+###	  filesystem parameters on Linux ext2/ext3 filesystems.
 
 ### config E2LABEL
-### 	bool "e2label"
-### 	default n
-### 	depends on TUNE2FS
-### 	help
-### 	  e2label will display or change the filesystem label on the ext2
-### 	  filesystem located on device.
+###	bool "e2label"
+###	default n
+###	depends on TUNE2FS
+###	help
+###	  e2label will display or change the filesystem label on the ext2
+###	  filesystem located on device.
 
+### NB: this one is now provided by util-linux/volume_id/*
 ### config FINDFS
-### 	bool "findfs"
-### 	default n
-### 	depends on TUNE2FS
-### 	help
-### 	  findfs will search the disks in the system looking for a filesystem
-### 	  which has a label matching label or a UUID equal to uuid.
+###	bool "findfs"
+###	default n
+###	depends on TUNE2FS
+###	help
+###	  findfs will search the disks in the system looking for a filesystem
+###	  which has a label matching label or a UUID equal to uuid.
 
 endmenu
diff --git a/config/busybox/init/Config.in b/config/busybox/init/Config.in
index b385e48c4..85fd8b9ba 100644
--- a/config/busybox/init/Config.in
+++ b/config/busybox/init/Config.in
@@ -14,7 +14,7 @@ config BB_CONFIG_INIT
 	  init is the first program run when the system boots.
 
 config BB_CONFIG_DEBUG_INIT
-	bool "debugging aid"
+	bool "Debugging aid"
 	default n
 	depends on BB_CONFIG_INIT
 	help
@@ -28,16 +28,38 @@ config BB_CONFIG_FEATURE_USE_INITTAB
 	help
 	  Allow init to read an inittab file when the system boot.
 
+config BB_CONFIG_FEATURE_KILL_REMOVED
+	bool "Support killing processes that have been removed from inittab"
+	default y
+	depends on BB_CONFIG_FEATURE_USE_INITTAB
+	help
+	  When respawn entries are removed from inittab and a SIGHUP is
+	  sent to init, this feature will kill the processes that have
+	  been removed.
+
+config BB_CONFIG_FEATURE_KILL_DELAY
+	int "How long to wait between TERM and KILL (0 - send TERM only)" if FEATURE_KILL_REMOVED
+	range 0 1024
+	default 0
+	help
+	  With nonzero setting, init sends TERM, forks, child waits N
+	  seconds, sends KILL and exits. Setting it too high is unwise
+	  (child will hang around for too long and can actually kill
+	  wrong process!)
+
 config BB_CONFIG_FEATURE_INIT_SCTTY
-	bool "Support running commands with a controlling-tty"
+	bool "Run commands with leading dash with controlling tty"
 	default n
 	depends on BB_CONFIG_INIT
 	help
-	  If this option is enabled a command starting with hyphen (-)
-	  is run in its own session (setsid(2)) and possibly with a
-	  controlling tty (TIOCSCTTY).  This is not the traditional init
-	  behavour, but is often what you want in an embedded system where
-	  the console is only accessed during development or for maintenance.
+	  If this option is enabled, init will try to give a controlling
+	  tty to any command which has leading hyphen (often it's "-/bin/sh").
+	  More precisely, init will do "ioctl(STDIN_FILENO, TIOCSCTTY, 0)".
+	  If device attached to STDIN_FILENO can be a ctty but is not yet
+	  a ctty for other session, it will become this process' ctty.
+	  This is not the traditional init behavour, but is often what you want
+	  in an embedded system where the console is only accessed during
+	  development or for maintenance.
 	  NB: using cttyhack applet may work better.
 
 config BB_CONFIG_FEATURE_INIT_SYSLOG
diff --git a/config/busybox/ipsvd/Config.in b/config/busybox/ipsvd/Config.in
deleted file mode 100644
index 254cca985..000000000
--- a/config/busybox/ipsvd/Config.in
+++ /dev/null
@@ -1,21 +0,0 @@
-#
-# For a description of the syntax of this configuration file,
-# see scripts/kbuild/config-language.txt.
-#
-
-menu "ipsvd utilities"
-	depends on BUSYBOX
-
-config BB_CONFIG_TCPSVD
-	bool "tcpsvd"
-	default n
-	help
-	  tcpsvd listens on a tcp port and runs a program for each new connection
-
-config BB_CONFIG_UDPSVD
-	bool "udpsvd"
-	default n
-	help
-	  udpsvd listens on a udp port and runs a program for each new connection
-
-endmenu
diff --git a/config/busybox/libbb/Config.in b/config/busybox/libbb/Config.in
index c9d19fa93..3b1933e77 100644
--- a/config/busybox/libbb/Config.in
+++ b/config/busybox/libbb/Config.in
@@ -58,14 +58,6 @@ config BB_CONFIG_FEATURE_EDITING_MAX_LEN
 	  You may want to decrease this parameter if your target machine
 	  benefits from smaller stack usage.
 
-config BB_CONFIG_FEATURE_EDITING_FANCY_KEYS
-	bool "Additional editing keys"
-	default n
-	depends on BB_CONFIG_FEATURE_EDITING
-	help
-	  Enable additonal editing keys (Ctrl-E, Ctrl-U etc).
-	  Arrow keys, Home/End/Delete and Ctrl-W work even without this option.
-
 config BB_CONFIG_FEATURE_EDITING_VI
 	bool "vi-style line editing commands"
 	default n
@@ -111,6 +103,21 @@ config BB_CONFIG_FEATURE_EDITING_FANCY_PROMPT
 	  Setting this option allows for prompts to use things like \w and
 	  \$ and escape codes.
 
+config BB_CONFIG_FEATURE_VERBOSE_CP_MESSAGE
+	bool "Give more precise messages when copy fails (cp, mv etc)"
+	default n
+	help
+	  Error messages with this feature enabled:
+	    $ cp file /does_not_exist/file
+	    cp: cannot create '/does_not_exist/file': Path does not exist
+	    $ cp file /vmlinuz/file
+	    cp: cannot stat '/vmlinuz/file': Path has non-directory component
+	  If this feature is not enabled, they will be, respectively:
+	    cp: cannot remove '/does_not_exist/file': No such file or directory
+	    cp: cannot stat '/vmlinuz/file': Not a directory
+	  respectively.
+	  This will cost you ~60 bytes.
+
 config BB_CONFIG_FEATURE_COPYBUF_KB
 	int "Copy buffer size, in kilobytes"
 	range 1 1024
diff --git a/config/busybox/loginutils/Config.in b/config/busybox/loginutils/Config.in
index 0fd986021..f83dae0ea 100644
--- a/config/busybox/loginutils/Config.in
+++ b/config/busybox/loginutils/Config.in
@@ -83,12 +83,31 @@ config BB_CONFIG_FEATURE_DEL_USER_FROM_GROUP
 	  If called with two non-option arguments, deluser
 	  or delgroup will remove an user from a specified group.
 
+config BB_CONFIG_FEATURE_CHECK_NAMES
+	bool "Enable sanity check on user/group names in adduser and addgroup"
+	default n
+	depends on BB_CONFIG_ADDUSER || BB_CONFIG_ADDGROUP
+	help
+	  Enable sanity check on user and group names in adduser and addgroup.
+	  To avoid problems, the user or group name should consist only of
+	  letters, digits, underscores, periods, at signs and dashes,
+	  and not start with a dash (as defined by IEEE Std 1003.1-2001).
+	  For compatibility with Samba machine accounts "$" is also supported
+	  at the end of the user or group name.
+
 config BB_CONFIG_ADDUSER
 	bool "adduser"
 	default n
 	help
 	  Utility for creating a new user account.
 
+config BB_CONFIG_FEATURE_ADDUSER_LONG_OPTIONS
+	bool "Enable long options"
+	default n
+	depends on BB_CONFIG_ADDUSER && BB_CONFIG_GETOPT_LONG
+	help
+	  Support long options for the adduser applet.
+
 config BB_CONFIG_DELUSER
 	bool "deluser"
 	default n
diff --git a/config/busybox/miscutils/Config.in b/config/busybox/miscutils/Config.in
index 76be2a03a..25fb71981 100644
--- a/config/busybox/miscutils/Config.in
+++ b/config/busybox/miscutils/Config.in
@@ -20,6 +20,73 @@ config BB_CONFIG_BBCONFIG
 	  The bbconfig applet will print the config file with which
 	  busybox was built.
 
+config BB_CONFIG_CHAT
+	bool "chat"
+	default n
+	help
+	  Simple chat utility.
+
+config BB_CONFIG_FEATURE_CHAT_NOFAIL
+	bool "Enable NOFAIL expect strings"
+	depends on BB_CONFIG_CHAT
+	default y
+	help
+	  When enabled expect strings which are started with a dash trigger
+	  no-fail mode. That is when expectation is not met within timeout
+	  the script is not terminated but sends next SEND string and waits
+	  for next EXPECT string. This allows to compose far more flexible
+	  scripts.
+
+config BB_CONFIG_FEATURE_CHAT_TTY_HIFI
+	bool "Force STDIN to be a TTY"
+	depends on BB_CONFIG_CHAT
+	default n
+	help
+	  Original chat always treats STDIN as a TTY device and sets for it
+	  so-called raw mode. This option turns on such behaviour.
+
+config BB_CONFIG_FEATURE_CHAT_IMPLICIT_CR
+	bool "Enable implicit Carriage Return"
+	depends on BB_CONFIG_CHAT
+	default y
+	help
+	  When enabled make chat to terminate all SEND strings with a "\r"
+	  unless "\c" is met anywhere in the string.
+
+config BB_CONFIG_FEATURE_CHAT_SWALLOW_OPTS
+	bool "Swallow options"
+	depends on BB_CONFIG_CHAT
+	default n
+	help
+	  Busybox chat require no options. To make it not fail when used
+	  in place of original chat (which has a bunch of options) turn
+	  this on.
+
+config BB_CONFIG_FEATURE_CHAT_SEND_ESCAPES
+	bool "Support weird SEND escapes"
+	depends on BB_CONFIG_CHAT
+	default n
+	help
+	  Original chat uses some escape sequences in SEND arguments which
+	  are not sent to device but rather performs special actions.
+	  E.g. "\K" means to send a break sequence to device.
+	  "\d" delays execution for a second, "\p" -- for a 1/100 of second.
+	  Before turning this option on think twice: do you really need them?
+
+config BB_CONFIG_FEATURE_CHAT_VAR_ABORT_LEN
+	bool "Support variable-length ABORT conditions"
+	depends on BB_CONFIG_CHAT
+	default n
+	help
+	  Original chat uses fixed 50-bytes length ABORT conditions. Say N here.
+
+config BB_CONFIG_FEATURE_CHAT_CLR_ABORT
+	bool "Support revoking of ABORT conditions"
+	depends on BB_CONFIG_CHAT
+	default n
+	help
+	  Support CLR_ABORT directive.
+
 config BB_CONFIG_CHRT
 	bool "chrt"
 	default n
@@ -40,15 +107,13 @@ config BB_CONFIG_CROND
 	      $ cat /var/spool/cron/crontabs/root
 	      # Run daily cron jobs at 4:40 every day:
 	      40 4 * * * /etc/cron/daily > /dev/null 2>&1
-	  Note that Busybox binary must be setuid root for this applet to
-	  work properly.
 
 config BB_CONFIG_DEBUG_CROND_OPTION
-	bool "Support debug option -d"
+	bool "Support option -d to redirect output to stderr"
 	depends on BB_CONFIG_CROND
 	default n
 	help
-	  Support option -d to enter debug mode.
+	  -d sets loglevel to 0 (most verbose) and directs all output to stderr.
 
 config BB_CONFIG_FEATURE_CROND_CALL_SENDMAIL
 	bool "Using /usr/sbin/sendmail?"
@@ -64,6 +129,8 @@ config BB_CONFIG_CRONTAB
 	help
 	  Crontab manipulates the crontab for a particular user.  Only
 	  the superuser may specify a different user and/or crontab directory.
+	  Note that Busybox binary must be setuid root for this applet to
+	  work properly.
 
 config BB_CONFIG_DC
 	bool "dc"
@@ -127,6 +194,14 @@ config BB_CONFIG_EJECT
 	help
 	  Used to eject cdroms.  (defaults to /dev/cdrom)
 
+config BB_CONFIG_FEATURE_EJECT_SCSI
+  bool "SCSI support"
+  default n
+  depends on BB_CONFIG_EJECT
+  help
+    Add the -s option to eject, this allows to eject SCSI-Devices and
+    usb-storage devices.
+
 config BB_CONFIG_LAST
 	bool "last"
 	default n
@@ -336,6 +411,12 @@ config BB_CONFIG_RX
 	help
 	  Receive files using the Xmodem protocol.
 
+config BB_CONFIG_SCRIPT
+	bool "script"
+	default n
+	help
+	  The script makes typescript of terminal session.
+
 config BB_CONFIG_STRINGS
 	bool "strings"
 	default n
@@ -357,7 +438,7 @@ config BB_CONFIG_TASKSET
 	  This requires sched_{g,s}etaffinity support in your libc.
 
 config BB_CONFIG_FEATURE_TASKSET_FANCY
-	bool "fancy output"
+	bool "Fancy output"
 	default y
 	depends on BB_CONFIG_TASKSET
 	help
@@ -393,4 +474,3 @@ config BB_CONFIG_WATCHDOG
 	  hung, and will cause the hardware to reboot.
 
 endmenu
-
diff --git a/config/busybox/modutils/Config.in b/config/busybox/modutils/Config.in
index a94deebbb..60348e722 100644
--- a/config/busybox/modutils/Config.in
+++ b/config/busybox/modutils/Config.in
@@ -74,7 +74,7 @@ config BB_CONFIG_LSMOD
 	  lsmod is used to display a list of loaded modules.
 
 config BB_CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT
-	bool "lsmod pretty output for 2.6.x Linux kernels "
+	bool "Pretty output for 2.6.x Linux kernels"
 	default n
 	depends on BB_CONFIG_LSMOD
 	help
diff --git a/config/busybox/networking/Config.in b/config/busybox/networking/Config.in
index 681c6aea8..dba833bff 100644
--- a/config/busybox/networking/Config.in
+++ b/config/busybox/networking/Config.in
@@ -48,6 +48,32 @@ config BB_CONFIG_ARPING
 	help
 	  Ping hosts by ARP packets.
 
+config BB_CONFIG_BRCTL
+	bool "brctl"
+	default n
+	help
+	  Manage ethernet bridges.
+	  Supports addbr/delbr and addif/delif.
+
+#config FEATURE_BRCTL_SHOW
+#	bool "Support show, showmac and showstp"
+#	default n
+#	depends on BRCTL
+#	help
+#	  Add support for option which print the current config:
+#	    showmacs, showstp, show
+
+config BB_CONFIG_FEATURE_BRCTL_FANCY
+	bool "Fancy options"
+	default n
+	depends on BB_CONFIG_BRCTL
+	help
+	  Add support for extended option like:
+	    setageing, setfd, sethello, setmaxage,
+	    setpathcost, setportprio, setbridgeprio,
+	    stp
+	  This adds about 600 bytes.
+
 config BB_CONFIG_DNSD
 	bool "dnsd"
 	default n
@@ -117,7 +143,7 @@ config BB_CONFIG_FEATURE_HTTPD_USE_SENDFILE
 	  instead of read/write loop.
 
 config BB_CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP
-	bool "Support reloading the global config file using hup signal"
+	bool "Support reloading of global config file on HUP signal"
 	default n
 	depends on BB_CONFIG_HTTPD
 	help
@@ -167,7 +193,7 @@ config BB_CONFIG_FEATURE_HTTPD_CGI
 	  when specific URLs are requested.
 
 config BB_CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR
-	bool "Enable support for running scripts through an interpreter"
+	bool "Support for running scripts through an interpreter"
 	default n
 	depends on BB_CONFIG_FEATURE_HTTPD_CGI
 	help
@@ -178,7 +204,7 @@ config BB_CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR
 	  *.php:/path/to/your/php
 
 config BB_CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV
-	bool "Support the REMOTE_PORT environment variable for CGI"
+	bool "Set REMOTE_PORT environment variable for CGI"
 	default n
 	depends on BB_CONFIG_FEATURE_HTTPD_CGI
 	help
@@ -186,17 +212,17 @@ config BB_CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV
 	  references that contain a unique port number.
 
 config BB_CONFIG_FEATURE_HTTPD_ENCODE_URL_STR
-	bool "Enable the -e option for shell script CGI simplification."
+	bool "Enable -e option (useful for CGIs written as shell scripts)"
 	default y
 	depends on BB_CONFIG_HTTPD
 	help
-	  This option allows html encoding arbitrary
-	  strings for display of the browser.  Output goes to stdout.
-	  For example, httpd -e "<Hello World>" as
+	  This option allows html encoding of arbitrary strings for display
+	  by the browser.  Output goes to stdout.
+	  For example, httpd -e "<Hello World>" produces
 	  "&#60Hello&#32World&#62".
 
 config BB_CONFIG_FEATURE_HTTPD_ERROR_PAGES
-	bool "Enable support for custom error pages"
+	bool "Support for custom error pages"
 	default n
 	depends on BB_CONFIG_HTTPD
 	help
@@ -209,7 +235,7 @@ config BB_CONFIG_FEATURE_HTTPD_ERROR_PAGES
 	  message.
 
 config BB_CONFIG_FEATURE_HTTPD_PROXY
-	bool "Enable support for reverse proxy"
+	bool "Support for reverse proxy"
 	default n
 	depends on BB_CONFIG_HTTPD
 	help
@@ -267,6 +293,13 @@ config BB_CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS
 	  Setting this will make ifconfig attempt to find the broadcast
 	  automatically if the value '+' is used.
 
+config BB_CONFIG_IFENSLAVE
+	bool "ifenslave"
+	default n
+	help
+	  Userspace application to bind several interfaces
+	  to a logical interface (use with kernel bonding driver).
+
 config BB_CONFIG_IFUPDOWN
 	bool "ifupdown"
 	default n
@@ -331,14 +364,14 @@ config BB_CONFIG_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN
 	  work.
 
 config BB_CONFIG_FEATURE_IFUPDOWN_IPV4
-	bool "Enable support for IPv4"
+	bool "Support for IPv4"
 	default y
 	depends on BB_CONFIG_IFUPDOWN
 	help
 	  If you want ifup/ifdown to talk IPv4, leave this on.
 
 config BB_CONFIG_FEATURE_IFUPDOWN_IPV6
-	bool "Enable support for IPv6"
+	bool "Support for IPv6"
 	default n
 	depends on BB_CONFIG_IFUPDOWN && BB_CONFIG_FEATURE_IPV6
 	help
@@ -346,7 +379,7 @@ config BB_CONFIG_FEATURE_IFUPDOWN_IPV6
 
 ### UNUSED
 ###config FEATURE_IFUPDOWN_IPX
-###	bool "Enable support for IPX"
+###	bool "Support for IPX"
 ###	default n
 ###	depends on IFUPDOWN
 ###	help
@@ -362,7 +395,7 @@ config BB_CONFIG_FEATURE_IFUPDOWN_MAPPING
 	  a weird network setup you don't need it.
 
 config BB_CONFIG_FEATURE_IFUPDOWN_EXTERNAL_DHCP
-	bool "Enable support for external dhcp clients"
+	bool "Support for external dhcp clients"
 	default n
 	depends on BB_CONFIG_IFUPDOWN
 	help
@@ -465,7 +498,7 @@ config BB_CONFIG_FEATURE_IP_RULE
 	  Add support for rule commands to "ip".
 
 config BB_CONFIG_FEATURE_IP_SHORT_FORMS
-	bool "Support short forms of ip commands."
+	bool "Support short forms of ip commands"
 	default n
 	depends on BB_CONFIG_IP
 	help
@@ -620,12 +653,6 @@ config BB_CONFIG_PING6
 	help
 	  This will give you a ping that can talk IPv6.
 
-config BB_CONFIG_PSCAN
-	bool "pscan"
-	default n
-	help
-	  Simple network port scanner.
-
 config BB_CONFIG_FEATURE_FANCY_PING
 	bool "Enable fancy ping output"
 	default y
@@ -634,12 +661,30 @@ config BB_CONFIG_FEATURE_FANCY_PING
 	  Make the output from the ping applet include statistics, and at the
 	  same time provide full support for ICMP packets.
 
+config BB_CONFIG_PSCAN
+	bool "pscan"
+	default n
+	help
+	  Simple network port scanner.
+
 config BB_CONFIG_ROUTE
 	bool "route"
 	default n
 	help
 	  Route displays or manipulates the kernel's IP routing tables.
 
+config BB_CONFIG_SENDMAIL
+	bool "sendmail"
+	default n
+	help
+	  Barebones sendmail.
+
+config BB_CONFIG_FETCHMAIL
+	bool "fetchmail"
+	default n
+	help
+	  Barebones fetchmail.
+
 config BB_CONFIG_SLATTACH
 	bool "slattach"
 	default n
@@ -730,28 +775,41 @@ config BB_CONFIG_TFTP
 	  is usually used for simple, small transfers such as a root image
 	  for a network-enabled bootloader.
 
+config BB_CONFIG_TFTPD
+	bool "tftpd"
+	default n
+	help
+	  This enables the Trivial File Transfer Protocol server program.
+	  It expects that stdin is a datagram socket and a packet
+	  is already pending on it. It will exit after one transfer.
+	  In other words: it should be run from inetd in nowait mode,
+	  or from udpsvd. Example: "udpsvd -E 0 69 tftpd DIR"
+
 config BB_CONFIG_FEATURE_TFTP_GET
 	bool "Enable \"get\" command"
 	default y
-	depends on BB_CONFIG_TFTP
+	depends on BB_CONFIG_TFTP || BB_CONFIG_TFTPD
 	help
 	  Add support for the GET command within the TFTP client.  This allows
 	  a client to retrieve a file from a TFTP server.
+	  Also enable upload support in tftpd, if tftpd is selected.
 
 config BB_CONFIG_FEATURE_TFTP_PUT
 	bool "Enable \"put\" command"
 	default y
-	depends on BB_CONFIG_TFTP
+	depends on BB_CONFIG_TFTP || BB_CONFIG_TFTPD
 	help
 	  Add support for the PUT command within the TFTP client.  This allows
 	  a client to transfer a file to a TFTP server.
+	  Also enable download support in tftpd, if tftpd is selected.
 
 config BB_CONFIG_FEATURE_TFTP_BLOCKSIZE
-	bool "Enable \"blocksize\" command"
+	bool "Enable \"blksize\" protocol option"
 	default n
-	depends on BB_CONFIG_TFTP
+	depends on BB_CONFIG_TFTP || BB_CONFIG_TFTPD
 	help
-	  Allow the client to specify the desired block size for transfers.
+	  Allow tftp to specify block size, and tftpd to understand
+	  "blksize" option.
 
 config BB_CONFIG_DEBUG_TFTP
 	bool "Enable debug"
@@ -839,4 +897,16 @@ config BB_CONFIG_ZCIP
 	  See http://www.zeroconf.org for further details, and "zcip.script"
 	  in the busybox examples.
 
+config BB_CONFIG_TCPSVD
+	bool "tcpsvd"
+	default n
+	help
+	  tcpsvd listens on a TCP port and runs a program for each new connection
+
+config BB_CONFIG_UDPSVD
+	bool "udpsvd"
+	default n
+	help
+	  udpsvd listens on an UDP port and runs a program for each new connection
+
 endmenu
diff --git a/config/busybox/networking/udhcp/Config.in b/config/busybox/networking/udhcp/Config.in
index c448759e7..a65d67f2c 100644
--- a/config/busybox/networking/udhcp/Config.in
+++ b/config/busybox/networking/udhcp/Config.in
@@ -42,6 +42,15 @@ config BB_CONFIG_FEATURE_UDHCPD_WRITE_LEASES_EARLY
 	  to send SIGUSR1 for the initial writing, or updating. Any timed
 	  rewriting remains undisturbed
 
+config BB_CONFIG_DHCPD_LEASES_FILE
+	string "Absolute path to lease file"
+	default "/var/lib/misc/udhcpd.leases"
+	depends on BB_CONFIG_APP_UDHCPD
+	help
+	  The udhcpd stores address in lease files. Normaly it is save
+	  to leave it untouched.
+
+
 config BB_CONFIG_APP_UDHCPC
 	bool "udhcp Client (udhcpc)"
 	default n
@@ -63,6 +72,13 @@ config BB_CONFIG_FEATURE_UDHCPC_ARPING
 	  is really available. The client will DHCPDECLINE the offer if the
 	  address is in use, and restart the discover process.
 
+config BB_CONFIG_FEATURE_UDHCP_PORT
+	bool "Enable '-P port' option for udhcpd and udhcpc"
+	default n
+	depends on BB_CONFIG_APP_UDHCPD || BB_CONFIG_APP_UDHCPC
+	help
+	  At the cost of ~300 bytes, enables -P port option.
+	  This feature is typically not needed.
 
 config BB_CONFIG_FEATURE_UDHCP_DEBUG
 	bool "Compile udhcp with noisy debugging messages"
@@ -83,6 +99,16 @@ config BB_CONFIG_FEATURE_RFC3397
 	  If selected, both client and server will support passing of domain
 	  search lists via option 119, specified in RFC3397.
 
+config BB_CONFIG_DHCPC_DEFAULT_SCRIPT
+	string "Absolute path to config script"
+	default "/usr/share/udhcpc/default.script"
+	depends on BB_CONFIG_APP_UDHCPC
+	help
+	  This script is called after udhcpc receives and answer. See
+	  examples/udhcp for a working example. Normaly it is save
+	  to leave this untouched.
+
+
 config BB_CONFIG_UDHCPC_SLACK_FOR_BUGGY_SERVERS
 	int "DHCP options slack buffer size"
 	default 80
diff --git a/config/busybox/procps/Config.in b/config/busybox/procps/Config.in
index 1ef1d3ee2..502db1a27 100644
--- a/config/busybox/procps/Config.in
+++ b/config/busybox/procps/Config.in
@@ -100,6 +100,21 @@ config BB_CONFIG_FEATURE_PS_WIDE
 	  If given once, 132 chars are printed and given more than
 	  one, the length is unlimited.
 
+config BB_CONFIG_FEATURE_PS_TIME
+	bool "Enable time and elapsed time output"
+	default n
+	depends on BB_CONFIG_PS && BB_CONFIG_DESKTOP
+	help
+	  Support -o time and -o etime output specifiers.
+
+config BB_CONFIG_FEATURE_PS_UNUSUAL_SYSTEMS
+	bool "Support Linux prior to 2.4.0 and non-ELF systems"
+	default n
+	depends on BB_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 BB_CONFIG_RENICE
 	bool "renice"
 	default n
diff --git a/config/busybox/sysklogd/Config.in b/config/busybox/sysklogd/Config.in
index 5ac1c66fd..8807e679d 100644
--- a/config/busybox/sysklogd/Config.in
+++ b/config/busybox/sysklogd/Config.in
@@ -43,6 +43,14 @@ config BB_CONFIG_FEATURE_REMOTE_LOG
 	  measure to prevent system logs from being tampered with
 	  by an intruder.
 
+config BB_CONFIG_FEATURE_SYSLOGD_DUP
+	bool "Support -D (drop dups) option"
+	default n
+	depends on BB_CONFIG_SYSLOGD
+	help
+	  Option -D instructs syslogd to drop consecutive messages
+	  which are totally the same.
+
 config BB_CONFIG_FEATURE_IPC_SYSLOG
 	bool "Circular Buffer support"
 	default n
@@ -77,7 +85,7 @@ config BB_CONFIG_LOGREAD
 	  stored in the syslogd circular buffer.
 
 config BB_CONFIG_FEATURE_LOGREAD_REDUCED_LOCKING
-	bool "logread double buffering"
+	bool "Double buffering"
 	default n
 	depends on BB_CONFIG_LOGREAD
 	help
diff --git a/config/busybox/util-linux/Config.in b/config/busybox/util-linux/Config.in
index f3df2454b..32e55fcda 100644
--- a/config/busybox/util-linux/Config.in
+++ b/config/busybox/util-linux/Config.in
@@ -19,7 +19,7 @@ config BB_CONFIG_DMESG
 	  wish to enable the 'dmesg' utility.
 
 config BB_CONFIG_FEATURE_DMESG_PRETTY
-	bool "pretty dmesg output"
+	bool "Pretty dmesg output"
 	default y
 	depends on BB_CONFIG_DMESG
 	help
@@ -94,7 +94,7 @@ config BB_CONFIG_FDISK
 	  'disk slices' that are defined on a hard drive.
 
 config BB_CONFIG_FDISK_SUPPORT_LARGE_DISKS
-	bool "support over 4GB disks"
+	bool "Support over 4GB disks"
 	default y
 	depends on BB_CONFIG_FDISK
 	help
@@ -151,6 +151,17 @@ config BB_CONFIG_FEATURE_FDISK_ADVANCED
 	  partition, and similarly evil things.  Unless you have a very good
 	  reason you would be wise to leave this disabled.
 
+config BB_CONFIG_FINDFS
+	bool "findfs"
+	default n
+	select BB_CONFIG_VOLUMEID
+	help
+	  This is similar to the findfs program that is part of the e2fsprogs
+	  package.  However, the e2fsprogs version only support ext2/3.  This
+	  version supports those in addition to FAT, swap, and ReiserFS.
+	  WARNING:
+	  With all submodules selected, it will add ~8k to busybox.
+
 config BB_CONFIG_FREERAMDISK
 	bool "freeramdisk"
 	default n
@@ -211,13 +222,6 @@ config BB_CONFIG_HEXDUMP
 	  The hexdump utility is used to display binary data in a readable
 	  way that is comparable to the output from most hex editors.
 
-config BB_CONFIG_HD
-	bool "hd"
-	default n
-	select BB_CONFIG_HEXDUMP
-	help
-	  hd is an alias to hexdump -C.
-
 config BB_CONFIG_FEATURE_HEXDUMP_REVERSE
 	bool "Support -R, reverse of 'hexdump -Cv'"
 	default n
@@ -228,6 +232,13 @@ config BB_CONFIG_FEATURE_HEXDUMP_REVERSE
 	  NB: this option is non-standard. It's unwise to use it in scripts
 	  aimed to be portable.
 
+config BB_CONFIG_HD
+	bool "hd"
+	default n
+	select BB_CONFIG_HEXDUMP
+	help
+	  hd is an alias to hexdump -C.
+
 config BB_CONFIG_HWCLOCK
 	bool "hwclock"
 	default n
@@ -302,6 +313,15 @@ config BB_CONFIG_FEATURE_MDEV_CONF
 
 	  For more information, please see docs/mdev.txt
 
+config BB_CONFIG_FEATURE_MDEV_RENAME
+	bool "Support subdirs/symlinks"
+	default n
+	depends on BB_CONFIG_FEATURE_MDEV_CONF
+	help
+	  Add support for renaming devices and creating symlinks.
+
+	  For more information, please see docs/mdev.txt
+
 config BB_CONFIG_FEATURE_MDEV_EXEC
 	bool "Support command execution at device addition/removal"
 	default n
@@ -337,7 +357,7 @@ config BB_CONFIG_MKSWAP
 	  the swap space using the 'swapon' utility.
 
 config BB_CONFIG_FEATURE_MKSWAP_V0
-	bool "version 0 support"
+	bool "Version 0 support"
 	default n
 	depends on BB_CONFIG_MKSWAP
 #	depends on MKSWAP && DEPRECATED
@@ -359,7 +379,7 @@ config BB_CONFIG_MORE
 config BB_CONFIG_FEATURE_USE_TERMIOS
 	bool "Use termios to manipulate the screen"
 	default y
-	depends on BB_CONFIG_MORE
+	depends on BB_CONFIG_MORE || BB_CONFIG_TOP
 	help
 	  This option allows utilities such as 'more' and 'top' to determine
 	  the size of the screen.  If you leave this disabled, your utilities
@@ -367,6 +387,216 @@ config BB_CONFIG_FEATURE_USE_TERMIOS
 	  will be unable to determine the current screen size, and will be
 	  unable to move the cursor.
 
+config BB_CONFIG_VOLUMEID
+	bool "Routines for detecting label and uuid on common filesystems"
+	default n
+	help
+	  TODO
+
+config BB_CONFIG_FEATURE_VOLUMEID_EXT
+	bool "Ext filesystem"
+	default n
+	depends on BB_CONFIG_VOLUMEID
+	help
+	  TODO
+
+config BB_CONFIG_FEATURE_VOLUMEID_REISERFS
+	bool "Reiser filesystem"
+	default n
+	depends on BB_CONFIG_VOLUMEID
+	help
+	  TODO
+
+config BB_CONFIG_FEATURE_VOLUMEID_FAT
+	bool "fat filesystem"
+	default n
+	depends on BB_CONFIG_VOLUMEID
+	help
+	  TODO
+
+config BB_CONFIG_FEATURE_VOLUMEID_HFS
+	bool "hfs filesystem"
+	default n
+	depends on BB_CONFIG_VOLUMEID
+	help
+	  TODO
+
+config BB_CONFIG_FEATURE_VOLUMEID_JFS
+	bool "jfs filesystem"
+	default n
+	depends on BB_CONFIG_VOLUMEID
+	help
+	  TODO
+
+### config FEATURE_VOLUMEID_UFS
+###	bool "ufs filesystem"
+###	default n
+###	depends on VOLUMEID
+###	help
+###	  TODO
+
+config BB_CONFIG_FEATURE_VOLUMEID_XFS
+	bool "xfs filesystem"
+	default n
+	depends on BB_CONFIG_VOLUMEID
+	help
+	  TODO
+
+config BB_CONFIG_FEATURE_VOLUMEID_NTFS
+	bool "ntfs filesystem"
+	default n
+	depends on BB_CONFIG_VOLUMEID
+	help
+	  TODO
+
+config BB_CONFIG_FEATURE_VOLUMEID_ISO9660
+	bool "iso9660 filesystem"
+	default n
+	depends on BB_CONFIG_VOLUMEID
+	help
+	  TODO
+
+config BB_CONFIG_FEATURE_VOLUMEID_UDF
+	bool "udf filesystem"
+	default n
+	depends on BB_CONFIG_VOLUMEID
+	help
+	  TODO
+
+config BB_CONFIG_FEATURE_VOLUMEID_LUKS
+	bool "luks filesystem"
+	default n
+	depends on BB_CONFIG_VOLUMEID
+	help
+	  TODO
+
+config BB_CONFIG_FEATURE_VOLUMEID_LINUXSWAP
+	bool "linux swap filesystem"
+	default n
+	depends on BB_CONFIG_VOLUMEID
+	help
+	  TODO
+
+### config FEATURE_VOLUMEID_LVM
+###	bool "lvm"
+###	default n
+###	depends on VOLUMEID
+###	help
+###	  TODO
+
+config BB_CONFIG_FEATURE_VOLUMEID_CRAMFS
+	bool "cramfs filesystem"
+	default n
+	depends on BB_CONFIG_VOLUMEID
+	help
+	  TODO
+
+### config FEATURE_VOLUMEID_HPFS
+###	bool "hpfs filesystem"
+###	default n
+###	depends on VOLUMEID
+###	help
+###	  TODO
+
+config BB_CONFIG_FEATURE_VOLUMEID_ROMFS
+	bool "romfs filesystem"
+	default n
+	depends on BB_CONFIG_VOLUMEID
+	help
+	  TODO
+
+config BB_CONFIG_FEATURE_VOLUMEID_SYSV
+	bool "sysv filesystem"
+	default n
+	depends on BB_CONFIG_VOLUMEID
+	help
+	  TODO
+
+### config FEATURE_VOLUMEID_MINIX
+###	bool "minix filesystem"
+###	default n
+###	depends on VOLUMEID
+###	help
+###	  TODO
+
+### These only detect partition tables - not used (yet?)
+### config FEATURE_VOLUMEID_MAC
+###	bool "mac filesystem"
+###	default n
+###	depends on VOLUMEID
+###	help
+###	  TODO
+### 
+### config FEATURE_VOLUMEID_MSDOS
+###	bool "msdos filesystem"
+###	default n
+###	depends on VOLUMEID
+###	help
+###	  TODO
+
+config BB_CONFIG_FEATURE_VOLUMEID_OCFS2
+	bool "ocfs2 filesystem"
+	default n
+	depends on BB_CONFIG_VOLUMEID
+	help
+	  TODO
+
+### config FEATURE_VOLUMEID_HIGHPOINTRAID
+###	bool "highpoint raid"
+###	default n
+###	depends on VOLUMEID
+###	help
+###	  TODO
+
+### config FEATURE_VOLUMEID_ISWRAID
+###	bool "intel raid"
+###	default n
+###	depends on VOLUMEID
+###	help
+###	  TODO
+
+### config FEATURE_VOLUMEID_LSIRAID
+###	bool "lsi raid"
+###	default n
+###	depends on VOLUMEID
+###	help
+###	  TODO
+
+### config FEATURE_VOLUMEID_VIARAID
+###	bool "via raid"
+###	default n
+###	depends on VOLUMEID
+###	help
+###	  TODO
+
+### config FEATURE_VOLUMEID_SILICONRAID
+###	bool "silicon raid"
+###	default n
+###	depends on VOLUMEID
+###	help
+###	  TODO
+
+### config FEATURE_VOLUMEID_NVIDIARAID
+###	bool "nvidia raid"
+###	default n
+###	depends on VOLUMEID
+###	help
+###	  TODO
+
+### config FEATURE_VOLUMEID_PROMISERAID
+###	bool "promise raid"
+###	default n
+###	depends on VOLUMEID
+###	help
+###	  TODO
+
+config BB_CONFIG_FEATURE_VOLUMEID_LINUXRAID
+	bool "linuxraid"
+	default n
+	depends on BB_CONFIG_VOLUMEID
+	help
+	  TODO
+
 config BB_CONFIG_MOUNT
 	bool "mount"
 	default n
@@ -378,15 +608,42 @@ config BB_CONFIG_MOUNT
 	  NFS filesystems.  Most people using BusyBox will also want to enable
 	  the 'mount' utility.
 
+config BB_CONFIG_FEATURE_MOUNT_FAKE
+	bool "Support option -f"
+	default n
+	depends on BB_CONFIG_MOUNT
+	help
+	  Enable support for faking a file system mount.
+
+config BB_CONFIG_FEATURE_MOUNT_VERBOSE
+	bool "Support option -v"
+	default n
+	depends on BB_CONFIG_MOUNT
+	help
+	  Enable multi-level -v[vv...] verbose messages. Useful if you
+	  debug mount problems and want to see what is exactly passed
+	  to the kernel.
+
 config BB_CONFIG_FEATURE_MOUNT_HELPERS
 	bool "Support mount helpers"
 	default n
 	depends on BB_CONFIG_MOUNT
 	help
 	  Enable mounting of virtual file systems via external helpers.
-	  E.g. mount obexfs#-b00.11.22.33.44.55 /mnt will in effect call
-	  obexfs -b00.11.22.33.44.55 /mnt
-	  The idea is to use such virtual filesystems in /etc/fstab
+	  E.g. "mount obexfs#-b00.11.22.33.44.55 /mnt" will in effect call
+	  "obexfs -b00.11.22.33.44.55 /mnt"
+	  Also "mount -t sometype [-o opts] fs /mnt" will try
+	  "sometype [-o opts] fs /mnt" if simple mount syscall fails.
+	  The idea is to use such virtual filesystems in /etc/fstab.
+
+config BB_CONFIG_FEATURE_MOUNT_LABEL
+	bool "Support specifiying devices by label or UUID"
+	default n
+	depends on BB_CONFIG_MOUNT
+	select BB_CONFIG_VOLUMEID
+	help
+	  This allows for specifying a device by label or uuid, rather than by
+	  name.  This feature utilizes the same functionality as findfs.
 
 config BB_CONFIG_FEATURE_MOUNT_NFS
 	bool "Support mounting NFS file systems"
@@ -448,6 +705,12 @@ config BB_CONFIG_READPROFILE
 	help
 	  This allows you to parse /proc/profile for basic profiling.
 
+config BB_CONFIG_RTCWAKE
+	bool "rtcwake"
+	default n
+	help
+	  Enter a system sleep state until specified wakeup time.
+
 config BB_CONFIG_SETARCH
 	bool "setarch"
 	default n
@@ -497,7 +760,7 @@ config BB_CONFIG_UMOUNT
 	  also want to enable 'umount'.
 
 config BB_CONFIG_FEATURE_UMOUNT_ALL
-	bool "umount -a option"
+	bool "Support option -a"
 	default n
 	depends on BB_CONFIG_UMOUNT
 	help
@@ -526,6 +789,7 @@ config BB_CONFIG_FEATURE_MTAB_SUPPORT
 	bool "Support for the old /etc/mtab file"
 	default n
 	depends on BB_CONFIG_MOUNT || BB_CONFIG_UMOUNT
+	select BB_CONFIG_FEATURE_MOUNT_FAKE
 	help
 	  Historically, Unix systems kept track of the currently mounted
 	  partitions in the file "/etc/mtab".  These days, the kernel exports
@@ -546,4 +810,3 @@ config BB_CONFIG_FEATURE_MTAB_SUPPORT
 	  your kernel.
 
 endmenu
-