busybox: sync Config.in files

The change was made with the following commands

	cd package/utils/busybox/config
	../convert_menuconfig.pl ~/git-repo/openwrt/openwrt/build_dir/target-mips_24kc_musl/busybox-1.30.1

convert_defaults.pl has no changes other than overwriting defaults for
BUSYBOX_DEFAULT_FEATURE_IPV6

Resolves FS#2146

Signed-off-by: Yousong Zhou <yszhou4tech@gmail.com>

1 files changed, 156 insertions, 106 deletions

diff --git a/package/utils/busybox/config/util-linux/Config.in b/package/utils/busybox/config/util-linux/Config.in
index 28b66fc818..20d7818f00 100644
--- a/package/utils/busybox/config/util-linux/Config.in
+++ b/package/utils/busybox/config/util-linux/Config.in
@@ -1,13 +1,13 @@
 # DO NOT EDIT. This file is generated from Config.src
 #
 # For a description of the syntax of this configuration file,
-# see scripts/kbuild/config-language.txt.
+# see docs/Kconfig-language.txt.
 #
 
 menu "Linux System Utilities"
 
 config BUSYBOX_CONFIG_ACPID
-	bool "acpid"
+	bool "acpid (9 kb)"
 	default BUSYBOX_DEFAULT_ACPID
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
@@ -29,19 +29,18 @@ config BUSYBOX_CONFIG_FEATURE_ACPID_COMPAT
 	help
 	Accept and ignore compatibility options -g -m -s -S -v.
 config BUSYBOX_CONFIG_BLKDISCARD
-	bool "blkdiscard"
+	bool "blkdiscard (4.3 kb)"
 	default BUSYBOX_DEFAULT_BLKDISCARD
+	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	blkdiscard discards sectors on a given device.
 config BUSYBOX_CONFIG_BLKID
-	bool "blkid"
+	bool "blkid (12 kb)"
 	default BUSYBOX_DEFAULT_BLKID
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	select BUSYBOX_CONFIG_VOLUMEID
 	help
 	Lists labels and UUIDs of all filesystems.
-	WARNING:
-	With all submodules selected, it will add ~8k to busybox.
 
 config BUSYBOX_CONFIG_FEATURE_BLKID_TYPE
 	bool "Print filesystem type"
@@ -50,23 +49,23 @@ config BUSYBOX_CONFIG_FEATURE_BLKID_TYPE
 	help
 	Show TYPE="filesystem type"
 config BUSYBOX_CONFIG_BLOCKDEV
-	bool "blockdev"
+	bool "blockdev (2.3 kb)"
 	default BUSYBOX_DEFAULT_BLOCKDEV
 	help
 	Performs some ioctls with block devices.
 config BUSYBOX_CONFIG_CAL
-	bool "cal"
+	bool "cal (5.8 kb)"
 	default BUSYBOX_DEFAULT_CAL
 	help
 	cal is used to display a monthly calendar.
 config BUSYBOX_CONFIG_CHRT
-	bool "chrt"
+	bool "chrt (4.7 kb)"
 	default BUSYBOX_DEFAULT_CHRT
 	help
-	manipulate real-time attributes of a process.
+	Manipulate real-time attributes of a process.
 	This requires sched_{g,s}etparam support in your libc.
 config BUSYBOX_CONFIG_DMESG
-	bool "dmesg"
+	bool "dmesg (3.7 kb)"
 	default BUSYBOX_DEFAULT_DMESG
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
@@ -88,18 +87,18 @@ config BUSYBOX_CONFIG_FEATURE_DMESG_PRETTY
 	"<#>".
 
 	With this option you will see:
-	    # dmesg
-	    Linux version 2.6.17.4 .....
-	    BIOS-provided physical RAM map:
-	     BIOS-e820: 0000000000000000 - 000000000009f000 (usable)
+		# dmesg
+		Linux version 2.6.17.4 .....
+		BIOS-provided physical RAM map:
+		 BIOS-e820: 0000000000000000 - 000000000009f000 (usable)
 
 	Without this option you will see:
-	    # dmesg
-	    <5>Linux version 2.6.17.4 .....
-	    <6>BIOS-provided physical RAM map:
-	    <6> BIOS-e820: 0000000000000000 - 000000000009f000 (usable)
+		# dmesg
+		<5>Linux version 2.6.17.4 .....
+		<6>BIOS-provided physical RAM map:
+		<6> BIOS-e820: 0000000000000000 - 000000000009f000 (usable)
 config BUSYBOX_CONFIG_EJECT
-	bool "eject"
+	bool "eject (4 kb)"
 	default BUSYBOX_DEFAULT_EJECT
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
@@ -113,18 +112,18 @@ config BUSYBOX_CONFIG_FEATURE_EJECT_SCSI
 	Add the -s option to eject, this allows to eject SCSI-Devices and
 	usb-storage devices.
 config BUSYBOX_CONFIG_FALLOCATE
-	bool "fallocate"
+	bool "fallocate (4.1 kb)"
 	default BUSYBOX_DEFAULT_FALLOCATE
 	help
 	Preallocate space for files.
 config BUSYBOX_CONFIG_FATATTR
-	bool "fatattr"
+	bool "fatattr (1.9 kb)"
 	default BUSYBOX_DEFAULT_FATATTR
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	fatattr lists or changes the file attributes on a fat file system.
 config BUSYBOX_CONFIG_FBSET
-	bool "fbset"
+	bool "fbset (5.9 kb)"
 	default BUSYBOX_DEFAULT_FBSET
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
@@ -152,13 +151,13 @@ config BUSYBOX_CONFIG_FEATURE_FBSET_READMODE
 	default BUSYBOX_DEFAULT_FEATURE_FBSET_READMODE /etc/fb.modes, which can be used to set frame buffer
 	device to pre-defined video modes.
 config BUSYBOX_CONFIG_FDFORMAT
-	bool "fdformat"
+	bool "fdformat (4.4 kb)"
 	default BUSYBOX_DEFAULT_FDFORMAT
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	fdformat is used to low-level format a floppy disk.
 config BUSYBOX_CONFIG_FDISK
-	bool "fdisk"
+	bool "fdisk (37 kb)"
 	default BUSYBOX_DEFAULT_FDISK
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
@@ -232,21 +231,19 @@ config BUSYBOX_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 BUSYBOX_CONFIG_FINDFS
-	bool "findfs"
+	bool "findfs (12 kb)"
 	default BUSYBOX_DEFAULT_FINDFS
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	select BUSYBOX_CONFIG_VOLUMEID
 	help
 	Prints the name of a filesystem with given label or UUID.
-	WARNING:
-	With all submodules selected, it will add ~8k to busybox.
 config BUSYBOX_CONFIG_FLOCK
-	bool "flock"
+	bool "flock (6.3 kb)"
 	default BUSYBOX_DEFAULT_FLOCK
 	help
 	Manage locks from shell scripts
 config BUSYBOX_CONFIG_FDFLUSH
-	bool "fdflush"
+	bool "fdflush (1.3 kb)"
 	default BUSYBOX_DEFAULT_FDFLUSH
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
@@ -259,7 +256,7 @@ config BUSYBOX_CONFIG_FDFLUSH
 	leave this disabled.
 
 config BUSYBOX_CONFIG_FREERAMDISK
-	bool "freeramdisk"
+	bool "freeramdisk (1.3 kb)"
 	default BUSYBOX_DEFAULT_FREERAMDISK
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
@@ -270,7 +267,7 @@ config BUSYBOX_CONFIG_FREERAMDISK
 	ramdisk. If you have no use for freeing memory from a ramdisk, leave
 	this disabled.
 config BUSYBOX_CONFIG_FSCK_MINIX
-	bool "fsck_minix"
+	bool "fsck.minix (13 kb)"
 	default BUSYBOX_DEFAULT_FSCK_MINIX
 	help
 	The minix filesystem is a nice, small, compact, read-write filesystem
@@ -280,20 +277,20 @@ config BUSYBOX_CONFIG_FSCK_MINIX
 	check for and attempt to repair any corruption that occurs to a minix
 	filesystem.
 config BUSYBOX_CONFIG_FSFREEZE
-	bool "fsfreeze"
+	bool "fsfreeze (3.5 kb)"
 	default BUSYBOX_DEFAULT_FSFREEZE
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	select BUSYBOX_CONFIG_LONG_OPTS
 	help
 	Halt new accesses and flush writes on a mounted filesystem.
 config BUSYBOX_CONFIG_FSTRIM
-	bool "fstrim"
+	bool "fstrim (4.4 kb)"
 	default BUSYBOX_DEFAULT_FSTRIM
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	Discard unused blocks on a mounted filesystem.
 config BUSYBOX_CONFIG_GETOPT
-	bool "getopt"
+	bool "getopt (5.8 kb)"
 	default BUSYBOX_DEFAULT_GETOPT
 	help
 	The getopt utility is used to break up (parse) options in command
@@ -304,13 +301,13 @@ config BUSYBOX_CONFIG_GETOPT
 	wisely leave this disabled.
 
 config BUSYBOX_CONFIG_FEATURE_GETOPT_LONG
-	bool "Support option -l"
-	default BUSYBOX_DEFAULT_FEATURE_GETOPT_LONG if BUSYBOX_CONFIG_LONG_OPTS
-	depends on BUSYBOX_CONFIG_GETOPT
+	bool "Support -l LONGOPTs"
+	default BUSYBOX_DEFAULT_FEATURE_GETOPT_LONG
+	depends on BUSYBOX_CONFIG_GETOPT && BUSYBOX_CONFIG_LONG_OPTS
 	help
 	Enable support for long options (option -l).
 config BUSYBOX_CONFIG_HEXDUMP
-	bool "hexdump"
+	bool "hexdump (8.6 kb)"
 	default BUSYBOX_DEFAULT_HEXDUMP
 	help
 	The hexdump utility is used to display binary data in a readable
@@ -327,18 +324,18 @@ config BUSYBOX_CONFIG_FEATURE_HEXDUMP_REVERSE
 	aimed to be portable.
 
 config BUSYBOX_CONFIG_HD
-	bool "hd"
+	bool "hd (7.8 kb)"
 	default BUSYBOX_DEFAULT_HD
 	help
 	hd is an alias to hexdump -C.
 config BUSYBOX_CONFIG_XXD
-	bool "xxd"
+	bool "xxd (8.9 kb)"
 	default BUSYBOX_DEFAULT_XXD
 	help
 	The xxd utility is used to display binary data in a readable
 	way that is comparable to the output from most hex editors.
 config BUSYBOX_CONFIG_HWCLOCK
-	bool "hwclock"
+	bool "hwclock (5.8 kb)"
 	default BUSYBOX_DEFAULT_HWCLOCK
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
@@ -347,11 +344,6 @@ config BUSYBOX_CONFIG_HWCLOCK
 	shutdown in the hardware clock, so the hardware will keep the
 	correct time when Linux is _not_ running.
 
-config BUSYBOX_CONFIG_FEATURE_HWCLOCK_LONG_OPTIONS
-	bool "Support long options (--hctosys,...)"
-	default BUSYBOX_DEFAULT_FEATURE_HWCLOCK_LONG_OPTIONS
-	depends on BUSYBOX_CONFIG_HWCLOCK && BUSYBOX_CONFIG_LONG_OPTS
-
 config BUSYBOX_CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS
 	bool "Use FHS /var/lib/hwclock/adjtime"
 	default BUSYBOX_DEFAULT_FEATURE_HWCLOCK_ADJTIME_FHS  # util-linux-ng in Fedora 13 still uses /etc/adjtime
@@ -364,28 +356,28 @@ config BUSYBOX_CONFIG_FEATURE_HWCLOCK_ADJTIME_FHS
 
 	pathname.com/fhs/pub/fhs-2.3.html#VARLIBHWCLOCKSTATEDIRECTORYFORHWCLO
 config BUSYBOX_CONFIG_IONICE
-	bool "ionice"
+	bool "ionice (3.8 kb)"
 	default BUSYBOX_DEFAULT_IONICE
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	Set/set program io scheduling class and priority
 	Requires kernel >= 2.6.13
 config BUSYBOX_CONFIG_IPCRM
-	bool "ipcrm"
+	bool "ipcrm (3.2 kb)"
 	default BUSYBOX_DEFAULT_IPCRM
 	help
 	The ipcrm utility allows the removal of System V interprocess
 	communication (IPC) objects and the associated data structures
 	from the system.
 config BUSYBOX_CONFIG_IPCS
-	bool "ipcs"
+	bool "ipcs (11 kb)"
 	default BUSYBOX_DEFAULT_IPCS
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	The ipcs utility is used to provide information on the currently
 	allocated System V interprocess (IPC) objects in the system.
 config BUSYBOX_CONFIG_LAST
-	bool "last"
+	bool "last (6.1 kb)"
 	default BUSYBOX_DEFAULT_LAST
 	depends on BUSYBOX_CONFIG_FEATURE_WTMP
 	help
@@ -399,7 +391,7 @@ config BUSYBOX_CONFIG_FEATURE_LAST_FANCY
 	'last' displays detailed information about the last users that
 	logged into the system (mimics sysvinit last). +900 bytes.
 config BUSYBOX_CONFIG_LOSETUP
-	bool "losetup"
+	bool "losetup (5.5 kb)"
 	default BUSYBOX_DEFAULT_LOSETUP
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
@@ -407,7 +399,7 @@ config BUSYBOX_CONFIG_LOSETUP
 	file or block device, and to query the status of a loop device. This
 	version does not currently support enabling data encryption.
 config BUSYBOX_CONFIG_LSPCI
-	bool "lspci"
+	bool "lspci (6.3 kb)"
 	default BUSYBOX_DEFAULT_LSPCI
 	#select PLATFORM_LINUX
 	help
@@ -416,7 +408,7 @@ config BUSYBOX_CONFIG_LSPCI
 
 	This version uses sysfs (/sys/bus/pci/devices) only.
 config BUSYBOX_CONFIG_LSUSB
-	bool "lsusb"
+	bool "lsusb (4.2 kb)"
 	default BUSYBOX_DEFAULT_LSUSB
 	#select PLATFORM_LINUX
 	help
@@ -425,7 +417,7 @@ config BUSYBOX_CONFIG_LSUSB
 
 	This version uses sysfs (/sys/bus/usb/devices) only.
 config BUSYBOX_CONFIG_MDEV
-	bool "mdev"
+	bool "mdev (17 kb)"
 	default BUSYBOX_DEFAULT_MDEV
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
@@ -472,7 +464,7 @@ config BUSYBOX_CONFIG_FEATURE_MDEV_EXEC
 	For more information, please see docs/mdev.txt
 
 config BUSYBOX_CONFIG_FEATURE_MDEV_LOAD_FIRMWARE
-	bool "Support loading of firmwares"
+	bool "Support loading of firmware"
 	default BUSYBOX_DEFAULT_FEATURE_MDEV_LOAD_FIRMWARE
 	depends on BUSYBOX_CONFIG_MDEV
 	help
@@ -482,7 +474,7 @@ config BUSYBOX_CONFIG_FEATURE_MDEV_LOAD_FIRMWARE
 	/lib/firmware/ and if it exists, send it to the kernel for
 	loading into the hardware.
 config BUSYBOX_CONFIG_MESG
-	bool "mesg"
+	bool "mesg (1.4 kb)"
 	default BUSYBOX_DEFAULT_MESG
 	help
 	Mesg controls access to your terminal by others. It is typically
@@ -500,20 +492,20 @@ config BUSYBOX_CONFIG_FEATURE_MESG_ENABLE_ONLY_GROUP
 	If you set this option to N, "mesg y" will enable writing
 	by anybody at all. This is not recommended.
 config BUSYBOX_CONFIG_MKE2FS
-	bool "mke2fs"
+	bool "mke2fs (10 kb)"
 	default BUSYBOX_DEFAULT_MKE2FS
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	Utility to create EXT2 filesystems.
 
 config BUSYBOX_CONFIG_MKFS_EXT2
-	bool "mkfs.ext2"
+	bool "mkfs.ext2 (10 kb)"
 	default BUSYBOX_DEFAULT_MKFS_EXT2
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	Alias to "mke2fs".
 config BUSYBOX_CONFIG_MKFS_MINIX
-	bool "mkfs_minix"
+	bool "mkfs.minix (10 kb)"
 	default BUSYBOX_DEFAULT_MKFS_MINIX
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
@@ -537,20 +529,20 @@ config BUSYBOX_CONFIG_MKFS_REISER
 	Utility to create ReiserFS filesystems.
 	Note: this applet needs a lot of testing and polishing.
 config BUSYBOX_CONFIG_MKDOSFS
-	bool "mkdosfs"
+	bool "mkdosfs (7.2 kb)"
 	default BUSYBOX_DEFAULT_MKDOSFS
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	Utility to create FAT32 filesystems.
 
 config BUSYBOX_CONFIG_MKFS_VFAT
-	bool "mkfs.vfat"
+	bool "mkfs.vfat (7.2 kb)"
 	default BUSYBOX_DEFAULT_MKFS_VFAT
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	Alias to "mkdosfs".
 config BUSYBOX_CONFIG_MKSWAP
-	bool "mkswap"
+	bool "mkswap (6.3 kb)"
 	default BUSYBOX_DEFAULT_MKSWAP
 	help
 	The mkswap utility is used to configure a file or disk partition as
@@ -569,7 +561,7 @@ config BUSYBOX_CONFIG_FEATURE_MKSWAP_UUID
 	help
 	Generate swap spaces with universally unique identifiers.
 config BUSYBOX_CONFIG_MORE
-	bool "more"
+	bool "more (7 kb)"
 	default BUSYBOX_DEFAULT_MORE
 	help
 	more is a simple utility which allows you to read text one screen
@@ -578,7 +570,7 @@ config BUSYBOX_CONFIG_MORE
 	you will probably find this utility very helpful. If you don't have
 	any need to reading text files, you can leave this disabled.
 config BUSYBOX_CONFIG_MOUNT
-	bool "mount"
+	bool "mount (23 kb)"
 	default BUSYBOX_DEFAULT_MOUNT
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
@@ -586,18 +578,17 @@ config BUSYBOX_CONFIG_MOUNT
 	tree. The 'mount' utility is used to graft a filesystem onto a
 	particular part of the tree. A filesystem can either live on a block
 	device, or it can be accessible over the network, as is the case with
-	NFS filesystems. Most people using BusyBox will also want to enable
-	the 'mount' utility.
+	NFS filesystems.
 
 config BUSYBOX_CONFIG_FEATURE_MOUNT_FAKE
-	bool "Support option -f"
+	bool "Support -f (fake mount)"
 	default BUSYBOX_DEFAULT_FEATURE_MOUNT_FAKE
 	depends on BUSYBOX_CONFIG_MOUNT
 	help
 	Enable support for faking a file system mount.
 
 config BUSYBOX_CONFIG_FEATURE_MOUNT_VERBOSE
-	bool "Support option -v"
+	bool "Support -v (verbose)"
 	default BUSYBOX_DEFAULT_FEATURE_MOUNT_VERBOSE
 	depends on BUSYBOX_CONFIG_MOUNT
 	help
@@ -625,7 +616,19 @@ config BUSYBOX_CONFIG_FEATURE_MOUNT_LABEL
 	help
 	This allows for specifying a device by label or uuid, rather than by
 	name. This feature utilizes the same functionality as blkid/findfs.
-	This also enables label or uuid support for swapon.
+
+config BUSYBOX_CONFIG_FEATURE_MOUNT_NFS
+	bool "Support mounting NFS file systems on Linux < 2.6.23"
+	default BUSYBOX_DEFAULT_FEATURE_MOUNT_NFS
+	depends on BUSYBOX_CONFIG_MOUNT
+	select BUSYBOX_CONFIG_FEATURE_SYSLOG
+	help
+	Enable mounting of NFS file systems on Linux kernels prior
+	to version 2.6.23. Note that in this case mounting of NFS
+	over IPv6 will not be possible.
+
+	Note that this option links in RPC support from libc,
+	which is rather large (~10 kbytes on uclibc).
 
 config BUSYBOX_CONFIG_FEATURE_MOUNT_CIFS
 	bool "Support mounting CIFS/SMB file systems"
@@ -646,7 +649,7 @@ config BUSYBOX_CONFIG_FEATURE_MOUNT_FLAGS
 
 config BUSYBOX_CONFIG_FEATURE_MOUNT_FSTAB
 	depends on BUSYBOX_CONFIG_MOUNT
-	bool "Support /etc/fstab and -a"
+	bool "Support /etc/fstab and -a (mount all)"
 	default BUSYBOX_DEFAULT_FEATURE_MOUNT_FSTAB
 	help
 	Support mount all and looking for files in /etc/fstab.
@@ -658,26 +661,38 @@ config BUSYBOX_CONFIG_FEATURE_MOUNT_OTHERTAB
 	help
 	Support mount -T (specifying an alternate fstab)
 config BUSYBOX_CONFIG_MOUNTPOINT
-	bool "mountpoint"
+	bool "mountpoint (4.9 kb)"
 	default BUSYBOX_DEFAULT_MOUNTPOINT
 	help
 	mountpoint checks if the directory is a mountpoint.
+config BUSYBOX_CONFIG_NOLOGIN
+	bool "nologin"
+	default BUSYBOX_DEFAULT_NOLOGIN
+	depends on BUSYBOX_CONFIG_FEATURE_SH_EMBEDDED_SCRIPTS
+	help
+	Politely refuse a login
+
+config BUSYBOX_CONFIG_NOLOGIN_DEPENDENCIES
+	bool "Enable dependencies for nologin"
+	default BUSYBOX_DEFAULT_NOLOGIN_DEPENDENCIES
+	depends on BUSYBOX_CONFIG_NOLOGIN
+	select BUSYBOX_CONFIG_CAT
+	select BUSYBOX_CONFIG_ECHO
+	select BUSYBOX_CONFIG_SLEEP
+	help
+	nologin is implemented as a shell script. It requires the
+	following in the runtime environment:
+		cat echo sleep
+	If you know these will be available externally you can
+	disable this option.
 config BUSYBOX_CONFIG_NSENTER
-	bool "nsenter"
+	bool "nsenter (6.5 kb)"
 	default BUSYBOX_DEFAULT_NSENTER
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	Run program with namespaces of other processes.
-
-config BUSYBOX_CONFIG_FEATURE_NSENTER_LONG_OPTS
-	bool "Enable long options"
-	default BUSYBOX_DEFAULT_FEATURE_NSENTER_LONG_OPTS
-	depends on BUSYBOX_CONFIG_NSENTER && BUSYBOX_CONFIG_LONG_OPTS
-	help
-	Support long options for the nsenter applet. This makes
-	the busybox implementation more compatible with upstream.
 config BUSYBOX_CONFIG_PIVOT_ROOT
-	bool "pivot_root"
+	bool "pivot_root (1.1 kb)"
 	default BUSYBOX_DEFAULT_PIVOT_ROOT
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
@@ -689,7 +704,7 @@ config BUSYBOX_CONFIG_PIVOT_ROOT
 	Note: This is for initrd in linux 2.4. Under initramfs (introduced
 	in linux 2.6) use switch_root instead.
 config BUSYBOX_CONFIG_RDATE
-	bool "rdate"
+	bool "rdate (5.6 kb)"
 	default BUSYBOX_DEFAULT_RDATE
 	help
 	The rdate utility allows you to synchronize the date and time of your
@@ -697,46 +712,46 @@ config BUSYBOX_CONFIG_RDATE
 	the RFC868 protocol, which is built into the inetd daemon on most
 	systems.
 config BUSYBOX_CONFIG_RDEV
-	bool "rdev"
+	bool "rdev (1.8 kb)"
 	default BUSYBOX_DEFAULT_RDEV
 	help
 	Print the device node associated with the filesystem mounted at '/'.
 config BUSYBOX_CONFIG_READPROFILE
-	bool "readprofile"
+	bool "readprofile (7.1 kb)"
 	default BUSYBOX_DEFAULT_READPROFILE
 	#select PLATFORM_LINUX
 	help
 	This allows you to parse /proc/profile for basic profiling.
 config BUSYBOX_CONFIG_RENICE
-	bool "renice"
+	bool "renice (4.2 kb)"
 	default BUSYBOX_DEFAULT_RENICE
 	help
 	Renice alters the scheduling priority of one or more running
 	processes.
 config BUSYBOX_CONFIG_REV
-	bool "rev"
+	bool "rev (4.4 kb)"
 	default BUSYBOX_DEFAULT_REV
 	help
 	Reverse lines of a file or files.
 config BUSYBOX_CONFIG_RTCWAKE
-	bool "rtcwake"
+	bool "rtcwake (6.8 kb)"
 	default BUSYBOX_DEFAULT_RTCWAKE
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	Enter a system sleep state until specified wakeup time.
 config BUSYBOX_CONFIG_SCRIPT
-	bool "script"
+	bool "script (8.6 kb)"
 	default BUSYBOX_DEFAULT_SCRIPT
 	help
 	The script makes typescript of terminal session.
 config BUSYBOX_CONFIG_SCRIPTREPLAY
-	bool "scriptreplay"
+	bool "scriptreplay (2.4 kb)"
 	default BUSYBOX_DEFAULT_SCRIPTREPLAY
 	help
 	This program replays a typescript, using timing information
 	given by script -t.
 config BUSYBOX_CONFIG_SETARCH
-	bool "setarch"
+	bool "setarch (3.6 kb)"
 	default BUSYBOX_DEFAULT_SETARCH
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
@@ -746,37 +761,64 @@ config BUSYBOX_CONFIG_SETARCH
 	(like amd64/x86, ppc64/ppc, sparc64/sparc, etc...).
 
 config BUSYBOX_CONFIG_LINUX32
-	bool "linux32"
+	bool "linux32 (3.3 kb)"
 	default BUSYBOX_DEFAULT_LINUX32
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	Alias to "setarch linux32".
 
 config BUSYBOX_CONFIG_LINUX64
-	bool "linux64"
+	bool "linux64 (3.3 kb)"
 	default BUSYBOX_DEFAULT_LINUX64
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	Alias to "setarch linux64".
 config BUSYBOX_CONFIG_SETPRIV
-	bool "setpriv"
+	bool "setpriv (6.6 kb)"
 	default BUSYBOX_DEFAULT_SETPRIV
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	select BUSYBOX_CONFIG_LONG_OPTS
 	help
 	Run a program with different Linux privilege settings.
 	Requires kernel >= 3.5
+
+config BUSYBOX_CONFIG_FEATURE_SETPRIV_DUMP
+	bool "Support dumping current privilege state"
+	default BUSYBOX_DEFAULT_FEATURE_SETPRIV_DUMP
+	depends on BUSYBOX_CONFIG_SETPRIV
+	help
+	Enables the "--dump" switch to print out the current privilege
+	state. This is helpful for diagnosing problems.
+
+config BUSYBOX_CONFIG_FEATURE_SETPRIV_CAPABILITIES
+	bool "Support capabilities"
+	default BUSYBOX_DEFAULT_FEATURE_SETPRIV_CAPABILITIES
+	depends on BUSYBOX_CONFIG_SETPRIV
+	help
+	Capabilities can be used to grant processes additional rights
+	without the necessity to always execute as the root user.
+	Enabling this option enables "--dump" to show information on
+	capabilities.
+
+config BUSYBOX_CONFIG_FEATURE_SETPRIV_CAPABILITY_NAMES
+	bool "Support capability names"
+	default BUSYBOX_DEFAULT_FEATURE_SETPRIV_CAPABILITY_NAMES
+	depends on BUSYBOX_CONFIG_SETPRIV && BUSYBOX_CONFIG_FEATURE_SETPRIV_CAPABILITIES
+	help
+	Capabilities can be either referenced via a human-readble name,
+	e.g. "net_admin", or using their index, e.g. "cap_12". Enabling
+	this option allows using the human-readable names in addition to
+	the index-based names.
 config BUSYBOX_CONFIG_SETSID
-	bool "setsid"
+	bool "setsid (3.6 kb)"
 	default BUSYBOX_DEFAULT_SETSID
 	help
 	setsid runs a program in a new session
 config BUSYBOX_CONFIG_SWAPON
-	bool "swapon"
+	bool "swapon (15 kb)"
 	default BUSYBOX_DEFAULT_SWAPON
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
-	This option enables the 'swapon' utility.
 	Once you have created some swap space using 'mkswap', you also need
 	to enable your swap space with the 'swapon' utility. The 'swapoff'
 	utility is used, typically at system shutdown, to disable any swap
@@ -800,13 +842,20 @@ config BUSYBOX_CONFIG_FEATURE_SWAPON_PRI
 	Enable support for setting swap device priority in swapon.
 
 config BUSYBOX_CONFIG_SWAPOFF
-	bool "swapoff"
+	bool "swapoff (14 kb)"
 	default BUSYBOX_DEFAULT_SWAPOFF
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
+
+config BUSYBOX_CONFIG_FEATURE_SWAPONOFF_LABEL
+	bool "Support specifying devices by label or UUID"
+	default BUSYBOX_DEFAULT_FEATURE_SWAPONOFF_LABEL
+	depends on BUSYBOX_CONFIG_SWAPON || BUSYBOX_CONFIG_SWAPOFF
+	select BUSYBOX_CONFIG_VOLUMEID
 	help
-	This option enables the 'swapoff' utility.
+	This allows for specifying a device by label or uuid, rather than by
+	name. This feature utilizes the same functionality as blkid/findfs.
 config BUSYBOX_CONFIG_SWITCH_ROOT
-	bool "switch_root"
+	bool "switch_root (5.5 kb)"
 	default BUSYBOX_DEFAULT_SWITCH_ROOT
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
@@ -824,8 +873,9 @@ config BUSYBOX_CONFIG_SWITCH_ROOT
 	* Because the Linux kernel uses rootfs internally as the starting
 	and ending point for searching through the kernel's doubly linked
 	list of active mount points. That's why.
+
 config BUSYBOX_CONFIG_TASKSET
-	bool "taskset"
+	bool "taskset (4.2 kb)"
 	default BUSYBOX_DEFAULT_TASKSET
 	help
 	Retrieve or set a processes's CPU affinity.
@@ -840,14 +890,14 @@ config BUSYBOX_CONFIG_FEATURE_TASKSET_FANCY
 	affinity parameter 0xHHHHHHHHHHHHHHHHHHHH can be arbitrarily long
 	in this case. Otherwise, it is limited to sizeof(long).
 config BUSYBOX_CONFIG_UEVENT
-	bool "uevent"
+	bool "uevent (3.1 kb)"
 	default BUSYBOX_DEFAULT_UEVENT
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
 	uevent is a netlink listener for kernel uevent notifications
 	sent via netlink. It is usually used for dynamic device creation.
 config BUSYBOX_CONFIG_UMOUNT
-	bool "umount"
+	bool "umount (5.1 kb)"
 	default BUSYBOX_DEFAULT_UMOUNT
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
 	help
@@ -857,13 +907,13 @@ config BUSYBOX_CONFIG_UMOUNT
 	utility, you almost certainly also want to enable 'umount'.
 
 config BUSYBOX_CONFIG_FEATURE_UMOUNT_ALL
-	bool "Support option -a"
+	bool "Support -a (unmount all)"
 	default BUSYBOX_DEFAULT_FEATURE_UMOUNT_ALL
 	depends on BUSYBOX_CONFIG_UMOUNT
 	help
 	Support -a option to unmount all currently mounted filesystems.
 config BUSYBOX_CONFIG_UNSHARE
-	bool "unshare"
+	bool "unshare (7.2 kb)"
 	default BUSYBOX_DEFAULT_UNSHARE
 	depends on !BUSYBOX_CONFIG_NOMMU
 	select BUSYBOX_CONFIG_PLATFORM_LINUX
@@ -871,7 +921,7 @@ config BUSYBOX_CONFIG_UNSHARE
 	help
 	Run program with some namespaces unshared from parent.
 config BUSYBOX_CONFIG_WALL
-	bool "wall"
+	bool "wall (2.6 kb)"
 	default BUSYBOX_DEFAULT_WALL
 	depends on BUSYBOX_CONFIG_FEATURE_UTMP
 	help