busybox: update to 1.26.2

Refresh patches, delete patches that have been applied upstream.

Signed-off-by: Magnus Kroken <mkroken@gmail.com>
Tested-by: Koen Vandeputte <koen.vandeputte@ncentric.com>
Signed-off-by: Felix Fietkau <nbd@nbd.name> [fix defaults]

1 files changed, 607 insertions, 562 deletions

diff --git a/package/utils/busybox/Config-defaults.in b/package/utils/busybox/Config-defaults.in
index 11cce03db9..141f08edc2 100644
--- a/package/utils/busybox/Config-defaults.in
+++ b/package/utils/busybox/Config-defaults.in
@@ -16,15 +16,6 @@ config BUSYBOX_DEFAULT_USE_PORTABLE_CODE
 config BUSYBOX_DEFAULT_PLATFORM_LINUX
 	bool
 	default y
-config BUSYBOX_DEFAULT_FEATURE_BUFFERS_USE_MALLOC
-	bool
-	default n
-config BUSYBOX_DEFAULT_FEATURE_BUFFERS_GO_ON_STACK
-	bool
-	default y
-config BUSYBOX_DEFAULT_FEATURE_BUFFERS_GO_IN_BSS
-	bool
-	default n
 config BUSYBOX_DEFAULT_SHOW_USAGE
 	bool
 	default y
@@ -43,45 +34,9 @@ config BUSYBOX_DEFAULT_FEATURE_INSTALLER
 config BUSYBOX_DEFAULT_INSTALL_NO_USR
 	bool
 	default n
-config BUSYBOX_DEFAULT_LOCALE_SUPPORT
-	bool
-	default n
-config BUSYBOX_DEFAULT_UNICODE_SUPPORT
-	bool
-	default n
-config BUSYBOX_DEFAULT_UNICODE_USING_LOCALE
-	bool
-	default n
-config BUSYBOX_DEFAULT_FEATURE_CHECK_UNICODE_IN_ENV
-	bool
-	default n
-config BUSYBOX_DEFAULT_SUBST_WCHAR
-	int
-	default 0
-config BUSYBOX_DEFAULT_LAST_SUPPORTED_WCHAR
-	int
-	default 0
-config BUSYBOX_DEFAULT_UNICODE_COMBINING_WCHARS
-	bool
-	default n
-config BUSYBOX_DEFAULT_UNICODE_WIDE_WCHARS
-	bool
-	default n
-config BUSYBOX_DEFAULT_UNICODE_BIDI_SUPPORT
-	bool
-	default n
-config BUSYBOX_DEFAULT_UNICODE_NEUTRAL_TABLE
-	bool
-	default n
-config BUSYBOX_DEFAULT_UNICODE_PRESERVE_BROKEN
-	bool
-	default n
 config BUSYBOX_DEFAULT_PAM
 	bool
 	default n
-config BUSYBOX_DEFAULT_FEATURE_USE_SENDFILE
-	bool
-	default n
 config BUSYBOX_DEFAULT_LONG_OPTS
 	bool
 	default y
@@ -163,6 +118,30 @@ config BUSYBOX_DEFAULT_EXTRA_LDFLAGS
 config BUSYBOX_DEFAULT_EXTRA_LDLIBS
 	string
 	default ""
+config BUSYBOX_DEFAULT_INSTALL_APPLET_SYMLINKS
+	bool
+	default y
+config BUSYBOX_DEFAULT_INSTALL_APPLET_HARDLINKS
+	bool
+	default n
+config BUSYBOX_DEFAULT_INSTALL_APPLET_SCRIPT_WRAPPERS
+	bool
+	default n
+config BUSYBOX_DEFAULT_INSTALL_APPLET_DONT
+	bool
+	default n
+config BUSYBOX_DEFAULT_INSTALL_SH_APPLET_SYMLINK
+	bool
+	default n
+config BUSYBOX_DEFAULT_INSTALL_SH_APPLET_HARDLINK
+	bool
+	default n
+config BUSYBOX_DEFAULT_INSTALL_SH_APPLET_SCRIPT_WRAPPER
+	bool
+	default n
+config BUSYBOX_DEFAULT_PREFIX
+	string
+	default "./_install"
 config BUSYBOX_DEFAULT_DEBUG
 	bool
 	default n
@@ -187,34 +166,19 @@ config BUSYBOX_DEFAULT_DMALLOC
 config BUSYBOX_DEFAULT_EFENCE
 	bool
 	default n
-config BUSYBOX_DEFAULT_INSTALL_APPLET_SYMLINKS
-	bool
-	default y
-config BUSYBOX_DEFAULT_INSTALL_APPLET_HARDLINKS
-	bool
-	default n
-config BUSYBOX_DEFAULT_INSTALL_APPLET_SCRIPT_WRAPPERS
-	bool
-	default n
-config BUSYBOX_DEFAULT_INSTALL_APPLET_DONT
-	bool
-	default n
-config BUSYBOX_DEFAULT_INSTALL_SH_APPLET_SYMLINK
+config BUSYBOX_DEFAULT_FEATURE_USE_BSS_TAIL
 	bool
 	default n
-config BUSYBOX_DEFAULT_INSTALL_SH_APPLET_HARDLINK
+config BUSYBOX_DEFAULT_FEATURE_RTMINMAX
 	bool
 	default n
-config BUSYBOX_DEFAULT_INSTALL_SH_APPLET_SCRIPT_WRAPPER
+config BUSYBOX_DEFAULT_FEATURE_BUFFERS_USE_MALLOC
 	bool
 	default n
-config BUSYBOX_DEFAULT_PREFIX
-	string
-	default "./_install"
-config BUSYBOX_DEFAULT_FEATURE_USE_BSS_TAIL
+config BUSYBOX_DEFAULT_FEATURE_BUFFERS_GO_ON_STACK
 	bool
-	default n
-config BUSYBOX_DEFAULT_FEATURE_RTMINMAX
+	default y
+config BUSYBOX_DEFAULT_FEATURE_BUFFERS_GO_IN_BSS
 	bool
 	default n
 config BUSYBOX_DEFAULT_PASSWORD_MINLEN
@@ -268,12 +232,48 @@ config BUSYBOX_DEFAULT_FEATURE_EDITING_FANCY_PROMPT
 config BUSYBOX_DEFAULT_FEATURE_EDITING_ASK_TERMINAL
 	bool
 	default n
+config BUSYBOX_DEFAULT_LOCALE_SUPPORT
+	bool
+	default n
+config BUSYBOX_DEFAULT_UNICODE_SUPPORT
+	bool
+	default n
+config BUSYBOX_DEFAULT_UNICODE_USING_LOCALE
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_CHECK_UNICODE_IN_ENV
+	bool
+	default n
+config BUSYBOX_DEFAULT_SUBST_WCHAR
+	int
+	default 0
+config BUSYBOX_DEFAULT_LAST_SUPPORTED_WCHAR
+	int
+	default 0
+config BUSYBOX_DEFAULT_UNICODE_COMBINING_WCHARS
+	bool
+	default n
+config BUSYBOX_DEFAULT_UNICODE_WIDE_WCHARS
+	bool
+	default n
+config BUSYBOX_DEFAULT_UNICODE_BIDI_SUPPORT
+	bool
+	default n
+config BUSYBOX_DEFAULT_UNICODE_NEUTRAL_TABLE
+	bool
+	default n
+config BUSYBOX_DEFAULT_UNICODE_PRESERVE_BROKEN
+	bool
+	default n
 config BUSYBOX_DEFAULT_FEATURE_NON_POSIX_CP
 	bool
 	default y
 config BUSYBOX_DEFAULT_FEATURE_VERBOSE_CP_MESSAGE
 	bool
 	default n
+config BUSYBOX_DEFAULT_FEATURE_USE_SENDFILE
+	bool
+	default n
 config BUSYBOX_DEFAULT_FEATURE_COPYBUF_KB
 	int
 	default 4
@@ -319,24 +319,36 @@ config BUSYBOX_DEFAULT_UNCOMPRESS
 config BUSYBOX_DEFAULT_GUNZIP
 	bool
 	default y
+config BUSYBOX_DEFAULT_ZCAT
+	bool
+	default y
 config BUSYBOX_DEFAULT_FEATURE_GUNZIP_LONG_OPTIONS
 	bool
 	default n
 config BUSYBOX_DEFAULT_BUNZIP2
 	bool
 	default y
+config BUSYBOX_DEFAULT_BZCAT
+	bool
+	default y
 config BUSYBOX_DEFAULT_UNLZMA
 	bool
 	default n
-config BUSYBOX_DEFAULT_FEATURE_LZMA_FAST
+config BUSYBOX_DEFAULT_LZCAT
 	bool
 	default n
 config BUSYBOX_DEFAULT_LZMA
 	bool
 	default n
+config BUSYBOX_DEFAULT_FEATURE_LZMA_FAST
+	bool
+	default n
 config BUSYBOX_DEFAULT_UNXZ
 	bool
 	default n
+config BUSYBOX_DEFAULT_XZCAT
+	bool
+	default n
 config BUSYBOX_DEFAULT_XZ
 	bool
 	default n
@@ -358,9 +370,6 @@ config BUSYBOX_DEFAULT_DPKG
 config BUSYBOX_DEFAULT_DPKG_DEB
 	bool
 	default n
-config BUSYBOX_DEFAULT_FEATURE_DPKG_DEB_EXTRACT_ONLY
-	bool
-	default n
 config BUSYBOX_DEFAULT_GZIP
 	bool
 	default y
@@ -376,6 +385,12 @@ config BUSYBOX_DEFAULT_FEATURE_GZIP_LEVELS
 config BUSYBOX_DEFAULT_LZOP
 	bool
 	default n
+config BUSYBOX_DEFAULT_UNLZOP
+	bool
+	default n
+config BUSYBOX_DEFAULT_LZOPCAT
+	bool
+	default n
 config BUSYBOX_DEFAULT_LZOP_COMPR_HIGH
 	bool
 	default n
@@ -427,138 +442,72 @@ config BUSYBOX_DEFAULT_UNZIP
 config BUSYBOX_DEFAULT_BASENAME
 	bool
 	default y
-config BUSYBOX_DEFAULT_CAT
-	bool
-	default y
-config BUSYBOX_DEFAULT_DATE
+config BUSYBOX_DEFAULT_CAL
 	bool
-	default y
-config BUSYBOX_DEFAULT_FEATURE_DATE_ISOFMT
+	default n
+config BUSYBOX_DEFAULT_CAT
 	bool
 	default y
-config BUSYBOX_DEFAULT_FEATURE_DATE_NANO
-	bool
-	default n
-config BUSYBOX_DEFAULT_FEATURE_DATE_COMPAT
+config BUSYBOX_DEFAULT_CATV
 	bool
 	default n
-config BUSYBOX_DEFAULT_DD
+config BUSYBOX_DEFAULT_CHGRP
 	bool
 	default y
-config BUSYBOX_DEFAULT_FEATURE_DD_SIGNAL_HANDLING
+config BUSYBOX_DEFAULT_CHMOD
 	bool
 	default y
-config BUSYBOX_DEFAULT_FEATURE_DD_THIRD_STATUS_LINE
-	bool
-	default n
-config BUSYBOX_DEFAULT_FEATURE_DD_IBS_OBS
+config BUSYBOX_DEFAULT_CHOWN
 	bool
 	default y
-config BUSYBOX_DEFAULT_FEATURE_DD_STATUS
-	bool
-	default n
-config BUSYBOX_DEFAULT_HOSTID
+config BUSYBOX_DEFAULT_FEATURE_CHOWN_LONG_OPTIONS
 	bool
 	default n
-config BUSYBOX_DEFAULT_ID
+config BUSYBOX_DEFAULT_CHROOT
 	bool
 	default y
-config BUSYBOX_DEFAULT_GROUPS
-	bool
-	default n
-config BUSYBOX_DEFAULT_SHUF
-	bool
-	default n
-config BUSYBOX_DEFAULT_STAT
-	bool
-	default n
-config BUSYBOX_DEFAULT_FEATURE_STAT_FORMAT
+config BUSYBOX_DEFAULT_CKSUM
 	bool
 	default n
-config BUSYBOX_DEFAULT_FEATURE_STAT_FILESYSTEM
+config BUSYBOX_DEFAULT_COMM
 	bool
 	default n
-config BUSYBOX_DEFAULT_SYNC
+config BUSYBOX_DEFAULT_CP
 	bool
 	default y
-config BUSYBOX_DEFAULT_FEATURE_SYNC_FANCY
+config BUSYBOX_DEFAULT_FEATURE_CP_LONG_OPTIONS
 	bool
 	default n
-config BUSYBOX_DEFAULT_TEST
-	bool
-	default y
-config BUSYBOX_DEFAULT_FEATURE_TEST_64
-	bool
-	default y
-config BUSYBOX_DEFAULT_TOUCH
+config BUSYBOX_DEFAULT_CUT
 	bool
 	default y
-config BUSYBOX_DEFAULT_FEATURE_TOUCH_NODEREF
-	bool
-	default n
-config BUSYBOX_DEFAULT_FEATURE_TOUCH_SUSV3
+config BUSYBOX_DEFAULT_DATE
 	bool
 	default y
-config BUSYBOX_DEFAULT_TR
+config BUSYBOX_DEFAULT_FEATURE_DATE_ISOFMT
 	bool
 	default y
-config BUSYBOX_DEFAULT_FEATURE_TR_CLASSES
-	bool
-	default n
-config BUSYBOX_DEFAULT_FEATURE_TR_EQUIV
-	bool
-	default n
-config BUSYBOX_DEFAULT_TRUNCATE
-	bool
-	default n
-config BUSYBOX_DEFAULT_UNLINK
-	bool
-	default n
-config BUSYBOX_DEFAULT_BASE64
-	bool
-	default n
-config BUSYBOX_DEFAULT_WHO
-	bool
-	default n
-config BUSYBOX_DEFAULT_USERS
-	bool
-	default n
-config BUSYBOX_DEFAULT_CAL
+config BUSYBOX_DEFAULT_FEATURE_DATE_NANO
 	bool
 	default n
-config BUSYBOX_DEFAULT_CATV
+config BUSYBOX_DEFAULT_FEATURE_DATE_COMPAT
 	bool
 	default n
-config BUSYBOX_DEFAULT_CHGRP
-	bool
-	default y
-config BUSYBOX_DEFAULT_CHMOD
-	bool
-	default y
-config BUSYBOX_DEFAULT_CHOWN
+config BUSYBOX_DEFAULT_DD
 	bool
 	default y
-config BUSYBOX_DEFAULT_FEATURE_CHOWN_LONG_OPTIONS
-	bool
-	default n
-config BUSYBOX_DEFAULT_CHROOT
+config BUSYBOX_DEFAULT_FEATURE_DD_SIGNAL_HANDLING
 	bool
 	default y
-config BUSYBOX_DEFAULT_CKSUM
-	bool
-	default n
-config BUSYBOX_DEFAULT_COMM
+config BUSYBOX_DEFAULT_FEATURE_DD_THIRD_STATUS_LINE
 	bool
 	default n
-config BUSYBOX_DEFAULT_CP
+config BUSYBOX_DEFAULT_FEATURE_DD_IBS_OBS
 	bool
 	default y
-config BUSYBOX_DEFAULT_FEATURE_CP_LONG_OPTIONS
+config BUSYBOX_DEFAULT_FEATURE_DD_STATUS
 	bool
 	default n
-config BUSYBOX_DEFAULT_CUT
-	bool
-	default y
 config BUSYBOX_DEFAULT_DF
 	bool
 	default y
@@ -598,6 +547,12 @@ config BUSYBOX_DEFAULT_EXPAND
 config BUSYBOX_DEFAULT_FEATURE_EXPAND_LONG_OPTIONS
 	bool
 	default n
+config BUSYBOX_DEFAULT_UNEXPAND
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_UNEXPAND_LONG_OPTIONS
+	bool
+	default n
 config BUSYBOX_DEFAULT_EXPR
 	bool
 	default y
@@ -619,6 +574,15 @@ config BUSYBOX_DEFAULT_HEAD
 config BUSYBOX_DEFAULT_FEATURE_FANCY_HEAD
 	bool
 	default y
+config BUSYBOX_DEFAULT_HOSTID
+	bool
+	default n
+config BUSYBOX_DEFAULT_ID
+	bool
+	default y
+config BUSYBOX_DEFAULT_GROUPS
+	bool
+	default n
 config BUSYBOX_DEFAULT_INSTALL
 	bool
 	default n
@@ -661,6 +625,21 @@ config BUSYBOX_DEFAULT_FEATURE_LS_COLOR_IS_DEFAULT
 config BUSYBOX_DEFAULT_MD5SUM
 	bool
 	default y
+config BUSYBOX_DEFAULT_SHA1SUM
+	bool
+	default n
+config BUSYBOX_DEFAULT_SHA256SUM
+	bool
+	default y
+config BUSYBOX_DEFAULT_SHA512SUM
+	bool
+	default n
+config BUSYBOX_DEFAULT_SHA3SUM
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_MD5_SHA1_SUM_CHECK
+	bool
+	default y
 config BUSYBOX_DEFAULT_MKDIR
 	bool
 	default y
@@ -718,16 +697,7 @@ config BUSYBOX_DEFAULT_FEATURE_RMDIR_LONG_OPTIONS
 config BUSYBOX_DEFAULT_SEQ
 	bool
 	default y
-config BUSYBOX_DEFAULT_SHA1SUM
-	bool
-	default n
-config BUSYBOX_DEFAULT_SHA256SUM
-	bool
-	default y
-config BUSYBOX_DEFAULT_SHA512SUM
-	bool
-	default n
-config BUSYBOX_DEFAULT_SHA3SUM
+config BUSYBOX_DEFAULT_SHUF
 	bool
 	default n
 config BUSYBOX_DEFAULT_SLEEP
@@ -751,12 +721,27 @@ config BUSYBOX_DEFAULT_SPLIT
 config BUSYBOX_DEFAULT_FEATURE_SPLIT_FANCY
 	bool
 	default n
+config BUSYBOX_DEFAULT_STAT
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_STAT_FORMAT
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_STAT_FILESYSTEM
+	bool
+	default n
 config BUSYBOX_DEFAULT_STTY
 	bool
 	default n
 config BUSYBOX_DEFAULT_SUM
 	bool
 	default n
+config BUSYBOX_DEFAULT_SYNC
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_SYNC_FANCY
+	bool
+	default n
 config BUSYBOX_DEFAULT_TAC
 	bool
 	default n
@@ -772,9 +757,42 @@ config BUSYBOX_DEFAULT_TEE
 config BUSYBOX_DEFAULT_FEATURE_TEE_USE_BLOCK_IO
 	bool
 	default y
+config BUSYBOX_DEFAULT_TEST
+	bool
+	default y
+config BUSYBOX_DEFAULT_TEST1
+	bool
+	default y
+config BUSYBOX_DEFAULT_TEST2
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_TEST_64
+	bool
+	default y
+config BUSYBOX_DEFAULT_TOUCH
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_TOUCH_NODEREF
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_TOUCH_SUSV3
+	bool
+	default y
+config BUSYBOX_DEFAULT_TR
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_TR_CLASSES
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_TR_EQUIV
+	bool
+	default n
 config BUSYBOX_DEFAULT_TRUE
 	bool
 	default y
+config BUSYBOX_DEFAULT_TRUNCATE
+	bool
+	default n
 config BUSYBOX_DEFAULT_TTY
 	bool
 	default n
@@ -784,21 +802,21 @@ config BUSYBOX_DEFAULT_UNAME
 config BUSYBOX_DEFAULT_UNAME_OSNAME
 	string
 	default "GNU/Linux"
-config BUSYBOX_DEFAULT_UNEXPAND
-	bool
-	default n
-config BUSYBOX_DEFAULT_FEATURE_UNEXPAND_LONG_OPTIONS
-	bool
-	default n
 config BUSYBOX_DEFAULT_UNIQ
 	bool
 	default y
+config BUSYBOX_DEFAULT_UNLINK
+	bool
+	default n
 config BUSYBOX_DEFAULT_USLEEP
 	bool
 	default n
 config BUSYBOX_DEFAULT_UUDECODE
 	bool
 	default n
+config BUSYBOX_DEFAULT_BASE64
+	bool
+	default n
 config BUSYBOX_DEFAULT_UUENCODE
 	bool
 	default n
@@ -808,6 +826,12 @@ config BUSYBOX_DEFAULT_WC
 config BUSYBOX_DEFAULT_FEATURE_WC_LARGE
 	bool
 	default n
+config BUSYBOX_DEFAULT_WHO
+	bool
+	default n
+config BUSYBOX_DEFAULT_USERS
+	bool
+	default n
 config BUSYBOX_DEFAULT_WHOAMI
 	bool
 	default n
@@ -826,15 +850,9 @@ config BUSYBOX_DEFAULT_FEATURE_AUTOWIDTH
 config BUSYBOX_DEFAULT_FEATURE_HUMAN_READABLE
 	bool
 	default y
-config BUSYBOX_DEFAULT_FEATURE_MD5_SHA1_SUM_CHECK
-	bool
-	default y
 config BUSYBOX_DEFAULT_CHVT
 	bool
 	default n
-config BUSYBOX_DEFAULT_FGCONSOLE
-	bool
-	default n
 config BUSYBOX_DEFAULT_CLEAR
 	bool
 	default y
@@ -844,12 +862,30 @@ config BUSYBOX_DEFAULT_DEALLOCVT
 config BUSYBOX_DEFAULT_DUMPKMAP
 	bool
 	default n
+config BUSYBOX_DEFAULT_FGCONSOLE
+	bool
+	default n
 config BUSYBOX_DEFAULT_KBD_MODE
 	bool
 	default n
 config BUSYBOX_DEFAULT_LOADFONT
 	bool
 	default n
+config BUSYBOX_DEFAULT_SETFONT
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_SETFONT_TEXTUAL_MAP
+	bool
+	default n
+config BUSYBOX_DEFAULT_DEFAULT_SETFONT_DIR
+	string
+	default ""
+config BUSYBOX_DEFAULT_FEATURE_LOADFONT_PSF2
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_LOADFONT_RAW
+	bool
+	default n
 config BUSYBOX_DEFAULT_LOADKMAP
 	bool
 	default n
@@ -871,15 +907,6 @@ config BUSYBOX_DEFAULT_SETCONSOLE
 config BUSYBOX_DEFAULT_FEATURE_SETCONSOLE_LONG_OPTIONS
 	bool
 	default n
-config BUSYBOX_DEFAULT_SETFONT
-	bool
-	default n
-config BUSYBOX_DEFAULT_FEATURE_SETFONT_TEXTUAL_MAP
-	bool
-	default n
-config BUSYBOX_DEFAULT_DEFAULT_SETFONT_DIR
-	string
-	default ""
 config BUSYBOX_DEFAULT_SETKEYCODES
 	bool
 	default n
@@ -889,12 +916,6 @@ config BUSYBOX_DEFAULT_SETLOGCONS
 config BUSYBOX_DEFAULT_SHOWKEY
 	bool
 	default n
-config BUSYBOX_DEFAULT_FEATURE_LOADFONT_PSF2
-	bool
-	default n
-config BUSYBOX_DEFAULT_FEATURE_LOADFONT_RAW
-	bool
-	default n
 config BUSYBOX_DEFAULT_MKTEMP
 	bool
 	default y
@@ -1081,10 +1102,10 @@ config BUSYBOX_DEFAULT_FEATURE_FIND_LINKS
 config BUSYBOX_DEFAULT_GREP
 	bool
 	default y
-config BUSYBOX_DEFAULT_FEATURE_GREP_EGREP_ALIAS
+config BUSYBOX_DEFAULT_EGREP
 	bool
 	default y
-config BUSYBOX_DEFAULT_FEATURE_GREP_FGREP_ALIAS
+config BUSYBOX_DEFAULT_FGREP
 	bool
 	default y
 config BUSYBOX_DEFAULT_FEATURE_GREP_CONTEXT
@@ -1120,6 +1141,12 @@ config BUSYBOX_DEFAULT_FEATURE_BOOTCHARTD_CONFIG_FILE
 config BUSYBOX_DEFAULT_HALT
 	bool
 	default y
+config BUSYBOX_DEFAULT_POWEROFF
+	bool
+	default y
+config BUSYBOX_DEFAULT_REBOOT
+	bool
+	default y
 config BUSYBOX_DEFAULT_FEATURE_CALL_TELINIT
 	bool
 	default n
@@ -1285,28 +1312,28 @@ config BUSYBOX_DEFAULT_LSATTR
 config BUSYBOX_DEFAULT_TUNE2FS
 	bool
 	default n
-config BUSYBOX_DEFAULT_MODINFO
+config BUSYBOX_DEFAULT_MODPROBE_SMALL
 	bool
 	default n
-config BUSYBOX_DEFAULT_MODPROBE_SMALL
+config BUSYBOX_DEFAULT_DEPMOD
 	bool
 	default n
-config BUSYBOX_DEFAULT_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE
+config BUSYBOX_DEFAULT_INSMOD
 	bool
 	default n
-config BUSYBOX_DEFAULT_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED
+config BUSYBOX_DEFAULT_LSMOD
 	bool
 	default n
-config BUSYBOX_DEFAULT_INSMOD
+config BUSYBOX_DEFAULT_FEATURE_LSMOD_PRETTY_2_6_OUTPUT
 	bool
 	default n
-config BUSYBOX_DEFAULT_RMMOD
+config BUSYBOX_DEFAULT_MODINFO
 	bool
 	default n
-config BUSYBOX_DEFAULT_LSMOD
+config BUSYBOX_DEFAULT_FEATURE_MODPROBE_SMALL_OPTIONS_ON_CMDLINE
 	bool
 	default n
-config BUSYBOX_DEFAULT_FEATURE_LSMOD_PRETTY_2_6_OUTPUT
+config BUSYBOX_DEFAULT_FEATURE_MODPROBE_SMALL_CHECK_ALREADY_LOADED
 	bool
 	default n
 config BUSYBOX_DEFAULT_MODPROBE
@@ -1315,7 +1342,7 @@ config BUSYBOX_DEFAULT_MODPROBE
 config BUSYBOX_DEFAULT_FEATURE_MODPROBE_BLACKLIST
 	bool
 	default n
-config BUSYBOX_DEFAULT_DEPMOD
+config BUSYBOX_DEFAULT_RMMOD
 	bool
 	default n
 config BUSYBOX_DEFAULT_FEATURE_2_4_MODULES
@@ -1354,102 +1381,33 @@ config BUSYBOX_DEFAULT_DEFAULT_MODULES_DIR
 config BUSYBOX_DEFAULT_DEFAULT_DEPMOD_FILE
 	string
 	default ""
-config BUSYBOX_DEFAULT_BLKDISCARD
-	bool
-	default n
-config BUSYBOX_DEFAULT_BLOCKDEV
-	bool
-	default n
-config BUSYBOX_DEFAULT_FATATTR
-	bool
-	default n
-config BUSYBOX_DEFAULT_FSTRIM
-	bool
-	default n
-config BUSYBOX_DEFAULT_MDEV
-	bool
-	default n
-config BUSYBOX_DEFAULT_FEATURE_MDEV_CONF
-	bool
-	default n
-config BUSYBOX_DEFAULT_FEATURE_MDEV_RENAME
-	bool
-	default n
-config BUSYBOX_DEFAULT_FEATURE_MDEV_RENAME_REGEXP
-	bool
-	default n
-config BUSYBOX_DEFAULT_FEATURE_MDEV_EXEC
-	bool
-	default n
-config BUSYBOX_DEFAULT_FEATURE_MDEV_LOAD_FIRMWARE
-	bool
-	default n
-config BUSYBOX_DEFAULT_MOUNT
-	bool
-	default y
-config BUSYBOX_DEFAULT_FEATURE_MOUNT_FAKE
-	bool
-	default n
-config BUSYBOX_DEFAULT_FEATURE_MOUNT_VERBOSE
-	bool
-	default n
-config BUSYBOX_DEFAULT_FEATURE_MOUNT_HELPERS
-	bool
-	default y
-config BUSYBOX_DEFAULT_FEATURE_MOUNT_LABEL
-	bool
-	default n
-config BUSYBOX_DEFAULT_FEATURE_MOUNT_NFS
-	bool
-	default n
-config BUSYBOX_DEFAULT_FEATURE_MOUNT_CIFS
-	bool
-	default y
-config BUSYBOX_DEFAULT_FEATURE_MOUNT_FLAGS
-	bool
-	default y
-config BUSYBOX_DEFAULT_FEATURE_MOUNT_FSTAB
-	bool
-	default y
-config BUSYBOX_DEFAULT_FEATURE_MOUNT_OTHERTAB
-	bool
-	default n
-config BUSYBOX_DEFAULT_NSENTER
-	bool
-	default n
-config BUSYBOX_DEFAULT_FEATURE_NSENTER_LONG_OPTS
-	bool
-	default n
-config BUSYBOX_DEFAULT_REV
-	bool
-	default n
-config BUSYBOX_DEFAULT_SETARCH
-	bool
-	default n
-config BUSYBOX_DEFAULT_UEVENT
-	bool
-	default n
-config BUSYBOX_DEFAULT_UNSHARE
-	bool
-	default n
 config BUSYBOX_DEFAULT_ACPID
 	bool
 	default n
 config BUSYBOX_DEFAULT_FEATURE_ACPID_COMPAT
 	bool
 	default n
+config BUSYBOX_DEFAULT_BLKDISCARD
+	bool
+	default n
 config BUSYBOX_DEFAULT_BLKID
 	bool
 	default n
 config BUSYBOX_DEFAULT_FEATURE_BLKID_TYPE
 	bool
 	default n
+config BUSYBOX_DEFAULT_BLOCKDEV
+	bool
+	default n
 config BUSYBOX_DEFAULT_DMESG
 	bool
 	default y
 config BUSYBOX_DEFAULT_FEATURE_DMESG_PRETTY
 	bool
 	default y
+config BUSYBOX_DEFAULT_FATATTR
+	bool
+	default n
 config BUSYBOX_DEFAULT_FBSET
 	bool
 	default n
@@ -1459,9 +1417,6 @@ config BUSYBOX_DEFAULT_FEATURE_FBSET_FANCY
 config BUSYBOX_DEFAULT_FEATURE_FBSET_READMODE
 	bool
 	default n
-config BUSYBOX_DEFAULT_FDFLUSH
-	bool
-	default n
 config BUSYBOX_DEFAULT_FDFORMAT
 	bool
 	default n
@@ -1498,25 +1453,16 @@ config BUSYBOX_DEFAULT_FINDFS
 config BUSYBOX_DEFAULT_FLOCK
 	bool
 	default n
-config BUSYBOX_DEFAULT_FREERAMDISK
-	bool
-	default n
-config BUSYBOX_DEFAULT_FSCK_MINIX
-	bool
-	default n
-config BUSYBOX_DEFAULT_MKFS_EXT2
-	bool
-	default n
-config BUSYBOX_DEFAULT_MKFS_MINIX
+config BUSYBOX_DEFAULT_FDFLUSH
 	bool
 	default n
-config BUSYBOX_DEFAULT_FEATURE_MINIX2
+config BUSYBOX_DEFAULT_FREERAMDISK
 	bool
 	default n
-config BUSYBOX_DEFAULT_MKFS_REISER
+config BUSYBOX_DEFAULT_FSCK_MINIX
 	bool
 	default n
-config BUSYBOX_DEFAULT_MKFS_VFAT
+config BUSYBOX_DEFAULT_FSTRIM
 	bool
 	default n
 config BUSYBOX_DEFAULT_GETOPT
@@ -1558,232 +1504,229 @@ config BUSYBOX_DEFAULT_LSPCI
 config BUSYBOX_DEFAULT_LSUSB
 	bool
 	default n
-config BUSYBOX_DEFAULT_MKSWAP
+config BUSYBOX_DEFAULT_MDEV
 	bool
-	default y
-config BUSYBOX_DEFAULT_FEATURE_MKSWAP_UUID
+	default n
+config BUSYBOX_DEFAULT_FEATURE_MDEV_CONF
 	bool
 	default n
-config BUSYBOX_DEFAULT_MORE
+config BUSYBOX_DEFAULT_FEATURE_MDEV_RENAME
 	bool
 	default n
-config BUSYBOX_DEFAULT_PIVOT_ROOT
+config BUSYBOX_DEFAULT_FEATURE_MDEV_RENAME_REGEXP
 	bool
-	default y
-config BUSYBOX_DEFAULT_RDATE
+	default n
+config BUSYBOX_DEFAULT_FEATURE_MDEV_EXEC
 	bool
 	default n
-config BUSYBOX_DEFAULT_RDEV
+config BUSYBOX_DEFAULT_FEATURE_MDEV_LOAD_FIRMWARE
 	bool
 	default n
-config BUSYBOX_DEFAULT_READPROFILE
+config BUSYBOX_DEFAULT_MKE2FS
 	bool
 	default n
-config BUSYBOX_DEFAULT_RTCWAKE
+config BUSYBOX_DEFAULT_MKFS_EXT2
 	bool
 	default n
-config BUSYBOX_DEFAULT_SCRIPT
+config BUSYBOX_DEFAULT_MKFS_MINIX
 	bool
 	default n
-config BUSYBOX_DEFAULT_SCRIPTREPLAY
+config BUSYBOX_DEFAULT_FEATURE_MINIX2
 	bool
 	default n
-config BUSYBOX_DEFAULT_SWAPONOFF
+config BUSYBOX_DEFAULT_MKFS_REISER
 	bool
 	default n
-config BUSYBOX_DEFAULT_FEATURE_SWAPON_DISCARD
+config BUSYBOX_DEFAULT_MKDOSFS
 	bool
 	default n
-config BUSYBOX_DEFAULT_FEATURE_SWAPON_PRI
+config BUSYBOX_DEFAULT_MKFS_VFAT
 	bool
 	default n
-config BUSYBOX_DEFAULT_SWITCH_ROOT
+config BUSYBOX_DEFAULT_MKSWAP
 	bool
 	default y
-config BUSYBOX_DEFAULT_UMOUNT
+config BUSYBOX_DEFAULT_FEATURE_MKSWAP_UUID
 	bool
-	default y
-config BUSYBOX_DEFAULT_FEATURE_UMOUNT_ALL
+	default n
+config BUSYBOX_DEFAULT_MORE
 	bool
-	default y
-config BUSYBOX_DEFAULT_FEATURE_MOUNT_LOOP
+	default n
+config BUSYBOX_DEFAULT_MOUNT
 	bool
 	default y
-config BUSYBOX_DEFAULT_FEATURE_MOUNT_LOOP_CREATE
+config BUSYBOX_DEFAULT_FEATURE_MOUNT_FAKE
 	bool
 	default n
-config BUSYBOX_DEFAULT_FEATURE_MTAB_SUPPORT
+config BUSYBOX_DEFAULT_FEATURE_MOUNT_VERBOSE
 	bool
 	default n
-config BUSYBOX_DEFAULT_VOLUMEID
+config BUSYBOX_DEFAULT_FEATURE_MOUNT_HELPERS
 	bool
-	default n
-config BUSYBOX_DEFAULT_FEATURE_VOLUMEID_BCACHE
+	default y
+config BUSYBOX_DEFAULT_FEATURE_MOUNT_LABEL
 	bool
 	default n
-config BUSYBOX_DEFAULT_FEATURE_VOLUMEID_BTRFS
+config BUSYBOX_DEFAULT_FEATURE_MOUNT_NFS
 	bool
 	default n
-config BUSYBOX_DEFAULT_FEATURE_VOLUMEID_CRAMFS
+config BUSYBOX_DEFAULT_FEATURE_MOUNT_CIFS
 	bool
-	default n
-config BUSYBOX_DEFAULT_FEATURE_VOLUMEID_EXFAT
+	default y
+config BUSYBOX_DEFAULT_FEATURE_MOUNT_FLAGS
 	bool
-	default n
-config BUSYBOX_DEFAULT_FEATURE_VOLUMEID_EXT
+	default y
+config BUSYBOX_DEFAULT_FEATURE_MOUNT_FSTAB
 	bool
-	default n
-config BUSYBOX_DEFAULT_FEATURE_VOLUMEID_F2FS
+	default y
+config BUSYBOX_DEFAULT_FEATURE_MOUNT_OTHERTAB
 	bool
 	default n
-config BUSYBOX_DEFAULT_FEATURE_VOLUMEID_FAT
+config BUSYBOX_DEFAULT_NSENTER
 	bool
 	default n
-config BUSYBOX_DEFAULT_FEATURE_VOLUMEID_HFS
+config BUSYBOX_DEFAULT_FEATURE_NSENTER_LONG_OPTS
 	bool
 	default n
-config BUSYBOX_DEFAULT_FEATURE_VOLUMEID_ISO9660
+config BUSYBOX_DEFAULT_PIVOT_ROOT
 	bool
-	default n
-config BUSYBOX_DEFAULT_FEATURE_VOLUMEID_JFS
+	default y
+config BUSYBOX_DEFAULT_RDATE
 	bool
 	default n
-config BUSYBOX_DEFAULT_FEATURE_VOLUMEID_LINUXRAID
+config BUSYBOX_DEFAULT_RDEV
 	bool
 	default n
-config BUSYBOX_DEFAULT_FEATURE_VOLUMEID_LINUXSWAP
+config BUSYBOX_DEFAULT_READPROFILE
 	bool
 	default n
-config BUSYBOX_DEFAULT_FEATURE_VOLUMEID_LUKS
+config BUSYBOX_DEFAULT_REV
 	bool
 	default n
-config BUSYBOX_DEFAULT_FEATURE_VOLUMEID_NILFS
+config BUSYBOX_DEFAULT_RTCWAKE
 	bool
 	default n
-config BUSYBOX_DEFAULT_FEATURE_VOLUMEID_NTFS
+config BUSYBOX_DEFAULT_SCRIPT
 	bool
 	default n
-config BUSYBOX_DEFAULT_FEATURE_VOLUMEID_OCFS2
+config BUSYBOX_DEFAULT_SCRIPTREPLAY
 	bool
 	default n
-config BUSYBOX_DEFAULT_FEATURE_VOLUMEID_REISERFS
+config BUSYBOX_DEFAULT_SETARCH
 	bool
 	default n
-config BUSYBOX_DEFAULT_FEATURE_VOLUMEID_ROMFS
+config BUSYBOX_DEFAULT_LINUX32
 	bool
 	default n
-config BUSYBOX_DEFAULT_FEATURE_VOLUMEID_SQUASHFS
+config BUSYBOX_DEFAULT_LINUX64
 	bool
 	default n
-config BUSYBOX_DEFAULT_FEATURE_VOLUMEID_SYSV
+config BUSYBOX_DEFAULT_SWAPON
 	bool
 	default n
-config BUSYBOX_DEFAULT_FEATURE_VOLUMEID_UDF
+config BUSYBOX_DEFAULT_FEATURE_SWAPON_DISCARD
 	bool
 	default n
-config BUSYBOX_DEFAULT_FEATURE_VOLUMEID_XFS
+config BUSYBOX_DEFAULT_FEATURE_SWAPON_PRI
 	bool
 	default n
-config BUSYBOX_DEFAULT_CONSPY
+config BUSYBOX_DEFAULT_SWAPOFF
 	bool
 	default n
-config BUSYBOX_DEFAULT_CROND
+config BUSYBOX_DEFAULT_SWITCH_ROOT
 	bool
 	default y
-config BUSYBOX_DEFAULT_FEATURE_CROND_D
+config BUSYBOX_DEFAULT_UEVENT
 	bool
 	default n
-config BUSYBOX_DEFAULT_FEATURE_CROND_CALL_SENDMAIL
+config BUSYBOX_DEFAULT_UMOUNT
 	bool
-	default n
-config BUSYBOX_DEFAULT_FEATURE_CROND_DIR
-	string
-	default "/etc"
-config BUSYBOX_DEFAULT_I2CGET
+	default y
+config BUSYBOX_DEFAULT_FEATURE_UMOUNT_ALL
 	bool
-	default n
-config BUSYBOX_DEFAULT_I2CSET
+	default y
+config BUSYBOX_DEFAULT_UNSHARE
 	bool
 	default n
-config BUSYBOX_DEFAULT_I2CDUMP
+config BUSYBOX_DEFAULT_FEATURE_MOUNT_LOOP
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_MOUNT_LOOP_CREATE
 	bool
 	default n
-config BUSYBOX_DEFAULT_I2CDETECT
+config BUSYBOX_DEFAULT_FEATURE_MTAB_SUPPORT
 	bool
 	default n
-config BUSYBOX_DEFAULT_LESS
+config BUSYBOX_DEFAULT_VOLUMEID
 	bool
-	default y
-config BUSYBOX_DEFAULT_FEATURE_LESS_MAXLINES
-	int
-	default 9999999
-config BUSYBOX_DEFAULT_FEATURE_LESS_BRACKETS
+	default n
+config BUSYBOX_DEFAULT_FEATURE_VOLUMEID_BCACHE
 	bool
 	default n
-config BUSYBOX_DEFAULT_FEATURE_LESS_FLAGS
+config BUSYBOX_DEFAULT_FEATURE_VOLUMEID_BTRFS
 	bool
 	default n
-config BUSYBOX_DEFAULT_FEATURE_LESS_TRUNCATE
+config BUSYBOX_DEFAULT_FEATURE_VOLUMEID_CRAMFS
 	bool
 	default n
-config BUSYBOX_DEFAULT_FEATURE_LESS_MARKS
+config BUSYBOX_DEFAULT_FEATURE_VOLUMEID_EXFAT
 	bool
 	default n
-config BUSYBOX_DEFAULT_FEATURE_LESS_REGEXP
+config BUSYBOX_DEFAULT_FEATURE_VOLUMEID_EXT
 	bool
 	default n
-config BUSYBOX_DEFAULT_FEATURE_LESS_WINCH
+config BUSYBOX_DEFAULT_FEATURE_VOLUMEID_F2FS
 	bool
 	default n
-config BUSYBOX_DEFAULT_FEATURE_LESS_ASK_TERMINAL
+config BUSYBOX_DEFAULT_FEATURE_VOLUMEID_FAT
 	bool
 	default n
-config BUSYBOX_DEFAULT_FEATURE_LESS_DASHCMD
+config BUSYBOX_DEFAULT_FEATURE_VOLUMEID_HFS
 	bool
 	default n
-config BUSYBOX_DEFAULT_FEATURE_LESS_LINENUMS
+config BUSYBOX_DEFAULT_FEATURE_VOLUMEID_ISO9660
 	bool
 	default n
-config BUSYBOX_DEFAULT_NANDWRITE
+config BUSYBOX_DEFAULT_FEATURE_VOLUMEID_JFS
 	bool
 	default n
-config BUSYBOX_DEFAULT_NANDDUMP
+config BUSYBOX_DEFAULT_FEATURE_VOLUMEID_LINUXRAID
 	bool
 	default n
-config BUSYBOX_DEFAULT_RFKILL
+config BUSYBOX_DEFAULT_FEATURE_VOLUMEID_LINUXSWAP
 	bool
 	default n
-config BUSYBOX_DEFAULT_SETSERIAL
+config BUSYBOX_DEFAULT_FEATURE_VOLUMEID_LUKS
 	bool
 	default n
-config BUSYBOX_DEFAULT_TASKSET
+config BUSYBOX_DEFAULT_FEATURE_VOLUMEID_NILFS
 	bool
 	default n
-config BUSYBOX_DEFAULT_FEATURE_TASKSET_FANCY
+config BUSYBOX_DEFAULT_FEATURE_VOLUMEID_NTFS
 	bool
 	default n
-config BUSYBOX_DEFAULT_UBIATTACH
+config BUSYBOX_DEFAULT_FEATURE_VOLUMEID_OCFS2
 	bool
 	default n
-config BUSYBOX_DEFAULT_UBIDETACH
+config BUSYBOX_DEFAULT_FEATURE_VOLUMEID_REISERFS
 	bool
 	default n
-config BUSYBOX_DEFAULT_UBIMKVOL
+config BUSYBOX_DEFAULT_FEATURE_VOLUMEID_ROMFS
 	bool
 	default n
-config BUSYBOX_DEFAULT_UBIRMVOL
+config BUSYBOX_DEFAULT_FEATURE_VOLUMEID_SQUASHFS
 	bool
 	default n
-config BUSYBOX_DEFAULT_UBIRSVOL
+config BUSYBOX_DEFAULT_FEATURE_VOLUMEID_SYSV
 	bool
 	default n
-config BUSYBOX_DEFAULT_UBIUPDATEVOL
+config BUSYBOX_DEFAULT_FEATURE_VOLUMEID_UBIFS
 	bool
 	default n
-config BUSYBOX_DEFAULT_UBIRENAME
+config BUSYBOX_DEFAULT_FEATURE_VOLUMEID_UDF
 	bool
 	default n
-config BUSYBOX_DEFAULT_WALL
+config BUSYBOX_DEFAULT_FEATURE_VOLUMEID_XFS
 	bool
 	default n
 config BUSYBOX_DEFAULT_ADJTIMEX
@@ -1831,6 +1774,21 @@ config BUSYBOX_DEFAULT_FEATURE_CHAT_CLR_ABORT
 config BUSYBOX_DEFAULT_CHRT
 	bool
 	default n
+config BUSYBOX_DEFAULT_CONSPY
+	bool
+	default n
+config BUSYBOX_DEFAULT_CROND
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_CROND_D
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_CROND_CALL_SENDMAIL
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_CROND_DIR
+	string
+	default "/etc"
 config BUSYBOX_DEFAULT_CRONTAB
 	bool
 	default y
@@ -1867,7 +1825,7 @@ config BUSYBOX_DEFAULT_FEATURE_EJECT_SCSI
 config BUSYBOX_DEFAULT_FBSPLASH
 	bool
 	default n
-config BUSYBOX_DEFAULT_FLASHCP
+config BUSYBOX_DEFAULT_FLASH_ERASEALL
 	bool
 	default n
 config BUSYBOX_DEFAULT_FLASH_LOCK
@@ -1876,40 +1834,85 @@ config BUSYBOX_DEFAULT_FLASH_LOCK
 config BUSYBOX_DEFAULT_FLASH_UNLOCK
 	bool
 	default n
-config BUSYBOX_DEFAULT_FLASH_ERASEALL
+config BUSYBOX_DEFAULT_FLASHCP
 	bool
 	default n
-config BUSYBOX_DEFAULT_IONICE
+config BUSYBOX_DEFAULT_HDPARM
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_HDPARM_GET_IDENTITY
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_HDPARM_HDIO_SCAN_HWIF
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_HDPARM_HDIO_DRIVE_RESET
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_HDPARM_HDIO_TRISTATE_HWIF
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_HDPARM_HDIO_GETSET_DMA
+	bool
+	default n
+config BUSYBOX_DEFAULT_I2CGET
+	bool
+	default n
+config BUSYBOX_DEFAULT_I2CSET
+	bool
+	default n
+config BUSYBOX_DEFAULT_I2CDUMP
+	bool
+	default n
+config BUSYBOX_DEFAULT_I2CDETECT
 	bool
 	default n
 config BUSYBOX_DEFAULT_INOTIFYD
 	bool
 	default n
+config BUSYBOX_DEFAULT_IONICE
+	bool
+	default n
 config BUSYBOX_DEFAULT_LAST
 	bool
 	default n
 config BUSYBOX_DEFAULT_FEATURE_LAST_FANCY
 	bool
 	default n
-config BUSYBOX_DEFAULT_HDPARM
+config BUSYBOX_DEFAULT_LESS
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_LESS_MAXLINES
+	int
+	default 9999999
+config BUSYBOX_DEFAULT_FEATURE_LESS_BRACKETS
 	bool
 	default n
-config BUSYBOX_DEFAULT_FEATURE_HDPARM_GET_IDENTITY
+config BUSYBOX_DEFAULT_FEATURE_LESS_FLAGS
 	bool
 	default n
-config BUSYBOX_DEFAULT_FEATURE_HDPARM_HDIO_SCAN_HWIF
+config BUSYBOX_DEFAULT_FEATURE_LESS_TRUNCATE
 	bool
 	default n
-config BUSYBOX_DEFAULT_FEATURE_HDPARM_HDIO_UNREGISTER_HWIF
+config BUSYBOX_DEFAULT_FEATURE_LESS_MARKS
 	bool
 	default n
-config BUSYBOX_DEFAULT_FEATURE_HDPARM_HDIO_DRIVE_RESET
+config BUSYBOX_DEFAULT_FEATURE_LESS_REGEXP
 	bool
 	default n
-config BUSYBOX_DEFAULT_FEATURE_HDPARM_HDIO_TRISTATE_HWIF
+config BUSYBOX_DEFAULT_FEATURE_LESS_WINCH
 	bool
 	default n
-config BUSYBOX_DEFAULT_FEATURE_HDPARM_HDIO_GETSET_DMA
+config BUSYBOX_DEFAULT_FEATURE_LESS_ASK_TERMINAL
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_LESS_DASHCMD
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_LESS_LINENUMS
 	bool
 	default n
 config BUSYBOX_DEFAULT_LOCK
@@ -1936,91 +1939,79 @@ config BUSYBOX_DEFAULT_MOUNTPOINT
 config BUSYBOX_DEFAULT_MT
 	bool
 	default n
-config BUSYBOX_DEFAULT_RAIDAUTORUN
+config BUSYBOX_DEFAULT_NANDWRITE
 	bool
 	default n
-config BUSYBOX_DEFAULT_READAHEAD
+config BUSYBOX_DEFAULT_NANDDUMP
 	bool
 	default n
-config BUSYBOX_DEFAULT_RUNLEVEL
+config BUSYBOX_DEFAULT_RAIDAUTORUN
 	bool
 	default n
-config BUSYBOX_DEFAULT_RX
+config BUSYBOX_DEFAULT_READAHEAD
 	bool
 	default n
-config BUSYBOX_DEFAULT_SETSID
+config BUSYBOX_DEFAULT_RFKILL
 	bool
 	default n
-config BUSYBOX_DEFAULT_STRINGS
-	bool
-	default y
-config BUSYBOX_DEFAULT_TIME
-	bool
-	default y
-config BUSYBOX_DEFAULT_TIMEOUT
+config BUSYBOX_DEFAULT_RUNLEVEL
 	bool
 	default n
-config BUSYBOX_DEFAULT_TTYSIZE
+config BUSYBOX_DEFAULT_RX
 	bool
 	default n
-config BUSYBOX_DEFAULT_VOLNAME
+config BUSYBOX_DEFAULT_SETSERIAL
 	bool
 	default n
-config BUSYBOX_DEFAULT_WATCHDOG
+config BUSYBOX_DEFAULT_SETSID
 	bool
 	default n
-config BUSYBOX_DEFAULT_NAMEIF
+config BUSYBOX_DEFAULT_STRINGS
 	bool
-	default n
-config BUSYBOX_DEFAULT_FEATURE_NAMEIF_EXTENDED
+	default y
+config BUSYBOX_DEFAULT_TASKSET
 	bool
 	default n
-config BUSYBOX_DEFAULT_NBDCLIENT
+config BUSYBOX_DEFAULT_FEATURE_TASKSET_FANCY
 	bool
 	default n
-config BUSYBOX_DEFAULT_NC
+config BUSYBOX_DEFAULT_TIME
 	bool
 	default y
-config BUSYBOX_DEFAULT_NC_SERVER
+config BUSYBOX_DEFAULT_TIMEOUT
 	bool
 	default n
-config BUSYBOX_DEFAULT_NC_EXTRA
+config BUSYBOX_DEFAULT_TTYSIZE
 	bool
 	default n
-config BUSYBOX_DEFAULT_NC_110_COMPAT
+config BUSYBOX_DEFAULT_UBIATTACH
 	bool
 	default n
-config BUSYBOX_DEFAULT_PING
-	bool
-	default y
-config BUSYBOX_DEFAULT_PING6
-	bool
-	default y
-config BUSYBOX_DEFAULT_FEATURE_FANCY_PING
+config BUSYBOX_DEFAULT_UBIDETACH
 	bool
-	default y
-config BUSYBOX_DEFAULT_WGET
+	default n
+config BUSYBOX_DEFAULT_UBIMKVOL
 	bool
 	default n
-config BUSYBOX_DEFAULT_FEATURE_WGET_STATUSBAR
+config BUSYBOX_DEFAULT_UBIRMVOL
 	bool
 	default n
-config BUSYBOX_DEFAULT_FEATURE_WGET_AUTHENTICATION
+config BUSYBOX_DEFAULT_UBIRSVOL
 	bool
 	default n
-config BUSYBOX_DEFAULT_FEATURE_WGET_LONG_OPTIONS
+config BUSYBOX_DEFAULT_UBIUPDATEVOL
 	bool
 	default n
-config BUSYBOX_DEFAULT_FEATURE_WGET_TIMEOUT
+config BUSYBOX_DEFAULT_UBIRENAME
 	bool
 	default n
-config BUSYBOX_DEFAULT_FEATURE_WGET_OPENSSL
+config BUSYBOX_DEFAULT_VOLNAME
 	bool
 	default n
-config BUSYBOX_DEFAULT_FEATURE_WGET_SSL_HELPER
+config BUSYBOX_DEFAULT_WALL
 	bool
 	default n
-config BUSYBOX_DEFAULT_WHOIS
+config BUSYBOX_DEFAULT_WATCHDOG
 	bool
 	default n
 config BUSYBOX_DEFAULT_FEATURE_IPV6
@@ -2056,19 +2047,16 @@ config BUSYBOX_DEFAULT_DNSD
 config BUSYBOX_DEFAULT_ETHER_WAKE
 	bool
 	default n
-config BUSYBOX_DEFAULT_FAKEIDENTD
-	bool
-	default n
 config BUSYBOX_DEFAULT_FTPD
 	bool
 	default n
-config BUSYBOX_DEFAULT_FEATURE_FTP_WRITE
+config BUSYBOX_DEFAULT_FEATURE_FTPD_WRITE
 	bool
 	default n
 config BUSYBOX_DEFAULT_FEATURE_FTPD_ACCEPT_BROKEN_LIST
 	bool
 	default n
-config BUSYBOX_DEFAULT_FEATURE_FTP_AUTHENTICATION
+config BUSYBOX_DEFAULT_FEATURE_FTPD_AUTHENTICATION
 	bool
 	default n
 config BUSYBOX_DEFAULT_FTPGET
@@ -2083,6 +2071,9 @@ config BUSYBOX_DEFAULT_FEATURE_FTPGETPUT_LONG_OPTIONS
 config BUSYBOX_DEFAULT_HOSTNAME
 	bool
 	default n
+config BUSYBOX_DEFAULT_DNSDOMAINNAME
+	bool
+	default n
 config BUSYBOX_DEFAULT_HTTPD
 	bool
 	default n
@@ -2143,7 +2134,10 @@ config BUSYBOX_DEFAULT_IFENSLAVE
 config BUSYBOX_DEFAULT_IFPLUGD
 	bool
 	default n
-config BUSYBOX_DEFAULT_IFUPDOWN
+config BUSYBOX_DEFAULT_IFUP
+	bool
+	default n
+config BUSYBOX_DEFAULT_IFDOWN
 	bool
 	default n
 config BUSYBOX_DEFAULT_IFUPDOWN_IFSTATE_PATH
@@ -2152,12 +2146,6 @@ config BUSYBOX_DEFAULT_IFUPDOWN_IFSTATE_PATH
 config BUSYBOX_DEFAULT_FEATURE_IFUPDOWN_IP
 	bool
 	default n
-config BUSYBOX_DEFAULT_FEATURE_IFUPDOWN_IP_BUILTIN
-	bool
-	default n
-config BUSYBOX_DEFAULT_FEATURE_IFUPDOWN_IFCONFIG_BUILTIN
-	bool
-	default n
 config BUSYBOX_DEFAULT_FEATURE_IFUPDOWN_IPV4
 	bool
 	default n
@@ -2194,6 +2182,24 @@ config BUSYBOX_DEFAULT_FEATURE_INETD_RPC
 config BUSYBOX_DEFAULT_IP
 	bool
 	default y
+config BUSYBOX_DEFAULT_IPADDR
+	bool
+	default n
+config BUSYBOX_DEFAULT_IPLINK
+	bool
+	default n
+config BUSYBOX_DEFAULT_IPROUTE
+	bool
+	default n
+config BUSYBOX_DEFAULT_IPTUNNEL
+	bool
+	default n
+config BUSYBOX_DEFAULT_IPRULE
+	bool
+	default n
+config BUSYBOX_DEFAULT_IPNEIGH
+	bool
+	default n
 config BUSYBOX_DEFAULT_FEATURE_IP_ADDRESS
 	bool
 	default y
@@ -2215,37 +2221,40 @@ config BUSYBOX_DEFAULT_FEATURE_IP_RULE
 config BUSYBOX_DEFAULT_FEATURE_IP_NEIGH
 	bool
 	default n
-config BUSYBOX_DEFAULT_FEATURE_IP_SHORT_FORMS
+config BUSYBOX_DEFAULT_FEATURE_IP_RARE_PROTOCOLS
 	bool
 	default n
-config BUSYBOX_DEFAULT_FEATURE_IP_RARE_PROTOCOLS
+config BUSYBOX_DEFAULT_IPCALC
 	bool
 	default n
-config BUSYBOX_DEFAULT_IPADDR
+config BUSYBOX_DEFAULT_FEATURE_IPCALC_FANCY
 	bool
 	default n
-config BUSYBOX_DEFAULT_IPLINK
+config BUSYBOX_DEFAULT_FEATURE_IPCALC_LONG_OPTIONS
 	bool
 	default n
-config BUSYBOX_DEFAULT_IPROUTE
+config BUSYBOX_DEFAULT_FAKEIDENTD
 	bool
 	default n
-config BUSYBOX_DEFAULT_IPTUNNEL
+config BUSYBOX_DEFAULT_NAMEIF
 	bool
 	default n
-config BUSYBOX_DEFAULT_IPRULE
+config BUSYBOX_DEFAULT_FEATURE_NAMEIF_EXTENDED
 	bool
 	default n
-config BUSYBOX_DEFAULT_IPNEIGH
+config BUSYBOX_DEFAULT_NBDCLIENT
 	bool
 	default n
-config BUSYBOX_DEFAULT_IPCALC
+config BUSYBOX_DEFAULT_NC
+	bool
+	default y
+config BUSYBOX_DEFAULT_NC_SERVER
 	bool
 	default n
-config BUSYBOX_DEFAULT_FEATURE_IPCALC_FANCY
+config BUSYBOX_DEFAULT_NC_EXTRA
 	bool
 	default n
-config BUSYBOX_DEFAULT_FEATURE_IPCALC_LONG_OPTIONS
+config BUSYBOX_DEFAULT_NC_110_COMPAT
 	bool
 	default n
 config BUSYBOX_DEFAULT_NETMSG
@@ -2272,6 +2281,15 @@ config BUSYBOX_DEFAULT_FEATURE_NTPD_SERVER
 config BUSYBOX_DEFAULT_FEATURE_NTPD_CONF
 	bool
 	default n
+config BUSYBOX_DEFAULT_PING
+	bool
+	default y
+config BUSYBOX_DEFAULT_PING6
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_FANCY_PING
+	bool
+	default y
 config BUSYBOX_DEFAULT_PSCAN
 	bool
 	default n
@@ -2284,6 +2302,9 @@ config BUSYBOX_DEFAULT_SLATTACH
 config BUSYBOX_DEFAULT_TCPSVD
 	bool
 	default n
+config BUSYBOX_DEFAULT_UDPSVD
+	bool
+	default n
 config BUSYBOX_DEFAULT_TELNET
 	bool
 	default n
@@ -2332,9 +2353,6 @@ config BUSYBOX_DEFAULT_TRACEROUTE6
 config BUSYBOX_DEFAULT_FEATURE_TRACEROUTE_VERBOSE
 	bool
 	default y
-config BUSYBOX_DEFAULT_FEATURE_TRACEROUTE_SOURCE_ROUTE
-	bool
-	default n
 config BUSYBOX_DEFAULT_FEATURE_TRACEROUTE_USE_ICMP
 	bool
 	default n
@@ -2344,6 +2362,36 @@ config BUSYBOX_DEFAULT_TUNCTL
 config BUSYBOX_DEFAULT_FEATURE_TUNCTL_UG
 	bool
 	default n
+config BUSYBOX_DEFAULT_VCONFIG
+	bool
+	default n
+config BUSYBOX_DEFAULT_WGET
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_WGET_STATUSBAR
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_WGET_AUTHENTICATION
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_WGET_LONG_OPTIONS
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_WGET_TIMEOUT
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_WGET_OPENSSL
+	bool
+	default n
+config BUSYBOX_DEFAULT_FEATURE_WGET_SSL_HELPER
+	bool
+	default n
+config BUSYBOX_DEFAULT_WHOIS
+	bool
+	default n
+config BUSYBOX_DEFAULT_ZCIP
+	bool
+	default n
 config BUSYBOX_DEFAULT_UDHCPC6
 	bool
 	default n
@@ -2395,15 +2443,6 @@ config BUSYBOX_DEFAULT_UDHCPC_SLACK_FOR_BUGGY_SERVERS
 config BUSYBOX_DEFAULT_IFUPDOWN_UDHCPC_CMD_OPTIONS
 	string
 	default ""
-config BUSYBOX_DEFAULT_UDPSVD
-	bool
-	default n
-config BUSYBOX_DEFAULT_VCONFIG
-	bool
-	default n
-config BUSYBOX_DEFAULT_ZCIP
-	bool
-	default n
 config BUSYBOX_DEFAULT_LPD
 	bool
 	default n
@@ -2416,9 +2455,6 @@ config BUSYBOX_DEFAULT_LPQ
 config BUSYBOX_DEFAULT_MAKEMIME
 	bool
 	default n
-config BUSYBOX_DEFAULT_FEATURE_MIME_CHARSET
-	string
-	default ""
 config BUSYBOX_DEFAULT_POPMAILDIR
 	bool
 	default n
@@ -2434,120 +2470,123 @@ config BUSYBOX_DEFAULT_FEATURE_REFORMIME_COMPAT
 config BUSYBOX_DEFAULT_SENDMAIL
 	bool
 	default n
-config BUSYBOX_DEFAULT_IOSTAT
+config BUSYBOX_DEFAULT_FEATURE_MIME_CHARSET
+	string
+	default ""
+config BUSYBOX_DEFAULT_FREE
 	bool
-	default n
-config BUSYBOX_DEFAULT_LSOF
+	default y
+config BUSYBOX_DEFAULT_FUSER
 	bool
 	default n
-config BUSYBOX_DEFAULT_MPSTAT
+config BUSYBOX_DEFAULT_IOSTAT
 	bool
 	default n
-config BUSYBOX_DEFAULT_NMETER
+config BUSYBOX_DEFAULT_KILL
 	bool
-	default n
-config BUSYBOX_DEFAULT_PMAP
+	default y
+config BUSYBOX_DEFAULT_KILLALL
 	bool
-	default n
-config BUSYBOX_DEFAULT_POWERTOP
+	default y
+config BUSYBOX_DEFAULT_KILLALL5
 	bool
 	default n
-config BUSYBOX_DEFAULT_PSTREE
+config BUSYBOX_DEFAULT_LSOF
 	bool
 	default n
-config BUSYBOX_DEFAULT_PWDX
+config BUSYBOX_DEFAULT_MPSTAT
 	bool
 	default n
-config BUSYBOX_DEFAULT_SMEMCAP
+config BUSYBOX_DEFAULT_NMETER
 	bool
 	default n
-config BUSYBOX_DEFAULT_TOP
+config BUSYBOX_DEFAULT_PGREP
 	bool
 	default y
-config BUSYBOX_DEFAULT_FEATURE_TOP_CPU_USAGE_PERCENTAGE
+config BUSYBOX_DEFAULT_PKILL
 	bool
-	default y
-config BUSYBOX_DEFAULT_FEATURE_TOP_CPU_GLOBAL_PERCENTS
+	default n
+config BUSYBOX_DEFAULT_PIDOF
 	bool
 	default y
-config BUSYBOX_DEFAULT_FEATURE_TOP_SMP_CPU
+config BUSYBOX_DEFAULT_FEATURE_PIDOF_SINGLE
 	bool
 	default n
-config BUSYBOX_DEFAULT_FEATURE_TOP_DECIMALS
+config BUSYBOX_DEFAULT_FEATURE_PIDOF_OMIT
 	bool
 	default n
-config BUSYBOX_DEFAULT_FEATURE_TOP_SMP_PROCESS
+config BUSYBOX_DEFAULT_PMAP
 	bool
 	default n
-config BUSYBOX_DEFAULT_FEATURE_TOPMEM
+config BUSYBOX_DEFAULT_POWERTOP
 	bool
 	default n
-config BUSYBOX_DEFAULT_UPTIME
+config BUSYBOX_DEFAULT_PS
 	bool
 	default y
-config BUSYBOX_DEFAULT_FEATURE_UPTIME_UTMP_SUPPORT
-	bool
-	default n
-config BUSYBOX_DEFAULT_FREE
+config BUSYBOX_DEFAULT_FEATURE_PS_WIDE
 	bool
 	default y
-config BUSYBOX_DEFAULT_FUSER
+config BUSYBOX_DEFAULT_FEATURE_PS_LONG
 	bool
 	default n
-config BUSYBOX_DEFAULT_KILL
-	bool
-	default y
-config BUSYBOX_DEFAULT_KILLALL
+config BUSYBOX_DEFAULT_FEATURE_PS_TIME
 	bool
-	default y
-config BUSYBOX_DEFAULT_KILLALL5
+	default n
+config BUSYBOX_DEFAULT_FEATURE_PS_ADDITIONAL_COLUMNS
 	bool
 	default n
-config BUSYBOX_DEFAULT_PGREP
+config BUSYBOX_DEFAULT_FEATURE_PS_UNUSUAL_SYSTEMS
 	bool
-	default y
-config BUSYBOX_DEFAULT_PIDOF
+	default n
+config BUSYBOX_DEFAULT_PSTREE
 	bool
-	default y
-config BUSYBOX_DEFAULT_FEATURE_PIDOF_SINGLE
+	default n
+config BUSYBOX_DEFAULT_PWDX
 	bool
 	default n
-config BUSYBOX_DEFAULT_FEATURE_PIDOF_OMIT
+config BUSYBOX_DEFAULT_RENICE
 	bool
 	default n
-config BUSYBOX_DEFAULT_PKILL
+config BUSYBOX_DEFAULT_SMEMCAP
 	bool
 	default n
-config BUSYBOX_DEFAULT_PS
+config BUSYBOX_DEFAULT_BB_SYSCTL
 	bool
 	default y
-config BUSYBOX_DEFAULT_FEATURE_PS_WIDE
+config BUSYBOX_DEFAULT_TOP
 	bool
 	default y
-config BUSYBOX_DEFAULT_FEATURE_PS_LONG
+config BUSYBOX_DEFAULT_FEATURE_TOP_CPU_USAGE_PERCENTAGE
 	bool
-	default n
-config BUSYBOX_DEFAULT_FEATURE_PS_TIME
+	default y
+config BUSYBOX_DEFAULT_FEATURE_TOP_CPU_GLOBAL_PERCENTS
+	bool
+	default y
+config BUSYBOX_DEFAULT_FEATURE_TOP_SMP_CPU
 	bool
 	default n
-config BUSYBOX_DEFAULT_FEATURE_PS_ADDITIONAL_COLUMNS
+config BUSYBOX_DEFAULT_FEATURE_TOP_DECIMALS
 	bool
 	default n
-config BUSYBOX_DEFAULT_FEATURE_PS_UNUSUAL_SYSTEMS
+config BUSYBOX_DEFAULT_FEATURE_TOP_SMP_PROCESS
 	bool
 	default n
-config BUSYBOX_DEFAULT_RENICE
+config BUSYBOX_DEFAULT_FEATURE_TOPMEM
 	bool
 	default n
-config BUSYBOX_DEFAULT_BB_SYSCTL
+config BUSYBOX_DEFAULT_UPTIME
 	bool
 	default y
-config BUSYBOX_DEFAULT_FEATURE_SHOW_THREADS
+config BUSYBOX_DEFAULT_FEATURE_UPTIME_UTMP_SUPPORT
 	bool
 	default n
 config BUSYBOX_DEFAULT_WATCH
 	bool
 	default n
+config BUSYBOX_DEFAULT_FEATURE_SHOW_THREADS
+	bool
+	default n
 config BUSYBOX_DEFAULT_CHPST
 	bool
 	default n
@@ -2578,6 +2617,9 @@ config BUSYBOX_DEFAULT_SV
 config BUSYBOX_DEFAULT_SV_DEFAULT_SERVICE_DIR
 	string
 	default ""
+config BUSYBOX_DEFAULT_SVC
+	bool
+	default n
 config BUSYBOX_DEFAULT_SVLOGD
 	bool
 	default n
@@ -2599,9 +2641,6 @@ config BUSYBOX_DEFAULT_LOAD_POLICY
 config BUSYBOX_DEFAULT_MATCHPATHCON
 	bool
 	default n
-config BUSYBOX_DEFAULT_RESTORECON
-	bool
-	default n
 config BUSYBOX_DEFAULT_RUNCON
 	bool
 	default n
@@ -2611,6 +2650,9 @@ config BUSYBOX_DEFAULT_FEATURE_RUNCON_LONG_OPTIONS
 config BUSYBOX_DEFAULT_SELINUXENABLED
 	bool
 	default n
+config BUSYBOX_DEFAULT_SESTATUS
+	bool
+	default n
 config BUSYBOX_DEFAULT_SETENFORCE
 	bool
 	default n
@@ -2620,15 +2662,45 @@ config BUSYBOX_DEFAULT_SETFILES
 config BUSYBOX_DEFAULT_FEATURE_SETFILES_CHECK_OPTION
 	bool
 	default n
+config BUSYBOX_DEFAULT_RESTORECON
+	bool
+	default n
 config BUSYBOX_DEFAULT_SETSEBOOL
 	bool
 	default n
-config BUSYBOX_DEFAULT_SESTATUS
+config BUSYBOX_DEFAULT_SH_IS_ASH
+	bool
+	default y
+config BUSYBOX_DEFAULT_SH_IS_HUSH
+	bool
+	default n
+config BUSYBOX_DEFAULT_SH_IS_NONE
+	bool
+	default n
+config BUSYBOX_DEFAULT_BASH_IS_ASH
+	bool
+	default n
+config BUSYBOX_DEFAULT_BASH_IS_HUSH
 	bool
 	default n
+config BUSYBOX_DEFAULT_BASH_IS_NONE
+	bool
+	default y
 config BUSYBOX_DEFAULT_ASH
 	bool
 	default y
+config BUSYBOX_DEFAULT_ASH_OPTIMIZE_FOR_SIZE
+	bool
+	default n
+config BUSYBOX_DEFAULT_ASH_INTERNAL_GLOB
+	bool
+	default y
+config BUSYBOX_DEFAULT_ASH_RANDOM_SUPPORT
+	bool
+	default n
+config BUSYBOX_DEFAULT_ASH_EXPAND_PRMT
+	bool
+	default y
 config BUSYBOX_DEFAULT_ASH_BASH_COMPAT
 	bool
 	default y
@@ -2662,15 +2734,6 @@ config BUSYBOX_DEFAULT_ASH_CMDCMD
 config BUSYBOX_DEFAULT_ASH_MAIL
 	bool
 	default n
-config BUSYBOX_DEFAULT_ASH_OPTIMIZE_FOR_SIZE
-	bool
-	default n
-config BUSYBOX_DEFAULT_ASH_RANDOM_SUPPORT
-	bool
-	default n
-config BUSYBOX_DEFAULT_ASH_EXPAND_PRMT
-	bool
-	default y
 config BUSYBOX_DEFAULT_CTTYHACK
 	bool
 	default n
@@ -2725,28 +2788,10 @@ config BUSYBOX_DEFAULT_HUSH_MODE_X
 config BUSYBOX_DEFAULT_MSH
 	bool
 	default n
-config BUSYBOX_DEFAULT_FEATURE_SH_IS_ASH
-	bool
-	default y
-config BUSYBOX_DEFAULT_FEATURE_SH_IS_HUSH
-	bool
-	default n
-config BUSYBOX_DEFAULT_FEATURE_SH_IS_NONE
-	bool
-	default n
-config BUSYBOX_DEFAULT_FEATURE_BASH_IS_ASH
-	bool
-	default n
-config BUSYBOX_DEFAULT_FEATURE_BASH_IS_HUSH
-	bool
-	default n
-config BUSYBOX_DEFAULT_FEATURE_BASH_IS_NONE
-	bool
-	default y
-config BUSYBOX_DEFAULT_SH_MATH_SUPPORT
+config BUSYBOX_DEFAULT_FEATURE_SH_MATH
 	bool
 	default y
-config BUSYBOX_DEFAULT_SH_MATH_SUPPORT_64
+config BUSYBOX_DEFAULT_FEATURE_SH_MATH_64
 	bool
 	default y
 config BUSYBOX_DEFAULT_FEATURE_SH_EXTRA_QUIET