Merge remote-tracking branch 'toybox/master' into HEAD

[android-x86/external-toybox.git] / .config

diff --git a/.config b/.config
index b557195..db28cb2 100644 (file)
--- a/.config
+++ b/.config
@@ -41,6 +41,7 @@ CONFIG_ECHO=y
 CONFIG_ENV=y
 CONFIG_EXPAND=y
 CONFIG_FALSE=y
+# CONFIG_FILE is not set
 CONFIG_FIND=y
 CONFIG_GREP=y
 CONFIG_EGREP=y
@@ -75,6 +76,7 @@ CONFIG_PASTE=y
 CONFIG_PATCH=y
 CONFIG_PRINTF=y
 CONFIG_PS=y
+# CONFIG_TTOP is not set
 CONFIG_PWD=y
 CONFIG_RENICE=y
 CONFIG_RM=y
@@ -95,11 +97,13 @@ CONFIG_TIME=y
 CONFIG_TOUCH=y
 CONFIG_TRUE=y
 CONFIG_TTY=y
+CONFIG_ULIMIT=y
 CONFIG_UNAME=y
 CONFIG_UNIQ=y
 # CONFIG_UNLINK is not set
 # CONFIG_UUDECODE is not set
 # CONFIG_UUENCODE is not set
+# CONFIG_VI is not set
 CONFIG_WC=y
 # CONFIG_WHO is not set
 CONFIG_XARGS=y
@@ -121,6 +125,7 @@ CONFIG_XARGS=y
 # CONFIG_CROND is not set
 # CONFIG_CRONTAB is not set
 CONFIG_DD=y
+# CONFIG_DHCP6 is not set
 # CONFIG_DHCP is not set
 # CONFIG_DHCPD is not set
 # CONFIG_DEBUG_DHCP is not set
@@ -139,6 +144,7 @@ CONFIG_EXPR=y
 CONFIG_HWCLOCK=y
 # CONFIG_ICONV is not set
 # CONFIG_INIT is not set
+# CONFIG_IOTOP is not set
 # CONFIG_IP is not set
 # CONFIG_IPCRM is not set
 # CONFIG_IPCS is not set
@@ -160,9 +166,10 @@ CONFIG_NETSTAT=y
 # CONFIG_OPENVT is not set
 # CONFIG_DEALLOCVT is not set
 CONFIG_PGREP=y
+CONFIG_PKILL=y
 # CONFIG_PING is not set
 # CONFIG_RESET is not set
-CONFIG_ROUTE=y
+# CONFIG_ROUTE is not set
 # CONFIG_SH is not set
 # CONFIG_EXIT is not set
 # CONFIG_CD is not set
@@ -181,6 +188,7 @@ CONFIG_TR=y
 # CONFIG_USERADD is not set
 # CONFIG_USERDEL is not set
 # CONFIG_WATCH is not set
+# CONFIG_WGET is not set
 # CONFIG_XZCAT is not set
 
 #
@@ -251,7 +259,7 @@ CONFIG_SETSID=y
 CONFIG_STAT=y
 CONFIG_SWAPOFF=y
 CONFIG_SWAPON=y
-CONFIG_SWITCH_ROOT=y
+# CONFIG_SWITCH_ROOT is not set
 CONFIG_SYSCTL=y
 CONFIG_TAC=y
 CONFIG_TASKSET=y
@@ -291,6 +299,8 @@ CONFIG_UMOUNT=y
 # CONFIG_SKELETON is not set
 # CONFIG_SKELETON_ALIAS is not set
 # CONFIG_TEST_HUMAN_READABLE is not set
+# CONFIG_TEST_MANY_OPTIONS is not set
+# CONFIG_TEST_SCANKEY is not set
 
 #
 # Android
@@ -320,7 +330,8 @@ CONFIG_TOYBOX_HELP=y
 CONFIG_TOYBOX_HELP_DASHDASH=y
 CONFIG_TOYBOX_I18N=y
 # CONFIG_TOYBOX_FREE is not set
-# CONFIG_TOYBOX_NORECURSE is not set
+CONFIG_TOYBOX_NORECURSE=y
 # CONFIG_TOYBOX_DEBUG is not set
 CONFIG_TOYBOX_UID_SYS=100
 CONFIG_TOYBOX_UID_USR=500
+# CONFIG_TOYBOX_MUSL_NOMMU_IS_BROKEN is not set