defconfig fix; "help output to fd 2" fix

diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index 86f85081c8f125e9279909416e5b707fb4eefcd5..06a83e58dc10002f768c53e5fce3e29834be366c 100644 (file)
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -638,6 +638,7 @@ static int busybox_main(char **argv)
                /* leading tab and room to wrap */
                output_width -= MAX_APPLET_NAME_LEN + 8;
 
+               dup2(1, 2);
                full_write2_str(bb_banner); /* reuse const string... */
                full_write2_str(" multi-call binary\n"
                       "Copyright (C) 1998-2008 Erik Andersen, Rob Landley, Denys Vlasenko\n"

diff --git a/scripts/defconfig b/scripts/defconfig
index a71fadd417236206a79a4a723229088fd094d648..2948016ee7cb5233fbe7a447a49e8c9f232ead3e 100644 (file)
--- a/scripts/defconfig
+++ b/scripts/defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
-# Busybox version: 1.10.0.svn
-# Fri Mar 21 21:33:40 2008
+# Busybox version: 1.11.0.svn
+# Wed Jun 25 12:56:32 2008
 #
 CONFIG_HAVE_DOT_CONFIG=y
 
@@ -13,6 +13,7 @@ CONFIG_HAVE_DOT_CONFIG=y
 # General Configuration
 #
 # CONFIG_DESKTOP is not set
+# CONFIG_FEATURE_ASSUME_UNICODE is not set
 CONFIG_FEATURE_BUFFERS_USE_MALLOC=y
 # CONFIG_FEATURE_BUFFERS_GO_ON_STACK is not set
 # CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
@@ -38,16 +39,19 @@ CONFIG_FEATURE_HAVE_RPC=y
 # Build Options
 #
 # CONFIG_STATIC is not set
+# CONFIG_PIE is not set
 # CONFIG_NOMMU is not set
 # CONFIG_BUILD_LIBBUSYBOX is not set
 # CONFIG_FEATURE_INDIVIDUAL is not set
 # CONFIG_FEATURE_SHARED_BUSYBOX is not set
 CONFIG_LFS=y
+CONFIG_CROSS_COMPILER_PREFIX=""
 
 #
 # Debugging Options
 #
 # CONFIG_DEBUG is not set
+# CONFIG_DEBUG_PESSIMIZE is not set
 # CONFIG_WERROR is not set
 CONFIG_NO_DEBUG_LIB=y
 # CONFIG_DMALLOC is not set
@@ -100,6 +104,7 @@ CONFIG_FEATURE_AR_LONG_FILENAMES=y
 CONFIG_BUNZIP2=y
 CONFIG_BZIP2=y
 CONFIG_CPIO=y
+CONFIG_FEATURE_CPIO_O=y
 # CONFIG_DPKG is not set
 # CONFIG_DPKG_DEB is not set
 # CONFIG_FEATURE_DPKG_DEB_EXTRACT_ONLY is not set
@@ -382,8 +387,9 @@ CONFIG_MESG=y
 # Login/Password Management Utilities
 #
 CONFIG_FEATURE_SHADOWPASSWDS=y
-CONFIG_USE_BB_SHADOW=y
 CONFIG_USE_BB_PWD_GRP=y
+CONFIG_USE_BB_SHADOW=y
+CONFIG_USE_BB_CRYPT=y
 CONFIG_ADDGROUP=y
 CONFIG_FEATURE_ADDUSER_TO_GROUP=y
 CONFIG_DELGROUP=y
@@ -420,6 +426,9 @@ CONFIG_LSATTR=y
 #
 # Linux Module Utilities
 #
+CONFIG_DEPMOD=y
+CONFIG_FEATURE_DEPMOD_PRUNE_FANCY=y
+CONFIG_FEATURE_DEPMOD_ALIAS=y
 CONFIG_INSMOD=y
 CONFIG_FEATURE_INSMOD_VERSION_CHECKING=y
 CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS=y
@@ -432,6 +441,7 @@ CONFIG_FEATURE_LSMOD_PRETTY_2_6_OUTPUT=y
 CONFIG_MODPROBE=y
 CONFIG_FEATURE_MODPROBE_MULTIPLE_OPTIONS=y
 CONFIG_FEATURE_MODPROBE_FANCY_ALIAS=y
+CONFIG_FEATURE_MODPROBE_BLACKLIST=y
 
 #
 # Options common to multiple modutils
@@ -439,6 +449,8 @@ CONFIG_FEATURE_MODPROBE_FANCY_ALIAS=y
 CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
 CONFIG_FEATURE_2_4_MODULES=y
 CONFIG_FEATURE_2_6_MODULES=y
+CONFIG_DEFAULT_MODULES_DIR="/lib/modules"
+CONFIG_DEFAULT_DEPMOD_FILE="modules.dep"
 # CONFIG_FEATURE_QUERY_MODULE_INTERFACE is not set
 
 #
@@ -481,6 +493,7 @@ CONFIG_LOSETUP=y
 CONFIG_MDEV=y
 CONFIG_FEATURE_MDEV_CONF=y
 CONFIG_FEATURE_MDEV_RENAME=y
+CONFIG_FEATURE_MDEV_RENAME_REGEXP=y
 CONFIG_FEATURE_MDEV_EXEC=y
 CONFIG_FEATURE_MDEV_LOAD_FIRMWARE=y
 CONFIG_MKSWAP=y
@@ -517,8 +530,10 @@ CONFIG_PIVOT_ROOT=y
 CONFIG_RDATE=y
 CONFIG_READPROFILE=y
 CONFIG_RTCWAKE=y
+CONFIG_SCRIPT=y
 CONFIG_SETARCH=y
 CONFIG_SWAPONOFF=y
+CONFIG_FEATURE_SWAPON_PRI=y
 CONFIG_SWITCH_ROOT=y
 CONFIG_UMOUNT=y
 CONFIG_FEATURE_UMOUNT_ALL=y
@@ -556,7 +571,10 @@ CONFIG_DC=y
 CONFIG_EJECT=y
 CONFIG_FEATURE_EJECT_SCSI=y
 CONFIG_FBSPLASH=y
+CONFIG_INOTIFYD=y
 CONFIG_LAST=y
+CONFIG_FEATURE_LAST_SMALL=y
+# CONFIG_FEATURE_LAST_FANCY is not set
 CONFIG_LESS=y
 CONFIG_FEATURE_LESS_MAXLINES=9999999
 CONFIG_FEATURE_LESS_BRACKETS=y
@@ -574,6 +592,7 @@ CONFIG_FEATURE_HDPARM_HDIO_GETSET_DMA=y
 CONFIG_MAKEDEVS=y
 # CONFIG_FEATURE_MAKEDEVS_LEAF is not set
 CONFIG_FEATURE_MAKEDEVS_TABLE=y
+CONFIG_MAN=y
 CONFIG_MICROCOM=y
 CONFIG_MOUNTPOINT=y
 CONFIG_MT=y
@@ -581,9 +600,8 @@ CONFIG_RAIDAUTORUN=y
 CONFIG_READAHEAD=y
 CONFIG_RUNLEVEL=y
 CONFIG_RX=y
-CONFIG_SCRIPT=y
-CONFIG_STRINGS=y
 CONFIG_SETSID=y
+CONFIG_STRINGS=y
 CONFIG_TASKSET=y
 CONFIG_FEATURE_TASKSET_FANCY=y
 CONFIG_TIME=y
@@ -600,6 +618,7 @@ CONFIG_ARP=y
 CONFIG_ARPING=y
 CONFIG_BRCTL=y
 CONFIG_FEATURE_BRCTL_FANCY=y
+CONFIG_FEATURE_BRCTL_SHOW=y
 CONFIG_DNSD=y
 CONFIG_ETHER_WAKE=y
 CONFIG_FAKEIDENTD=y
@@ -761,6 +780,7 @@ CONFIG_ASH_MATH_SUPPORT=y
 CONFIG_ASH_MATH_SUPPORT_64=y
 # CONFIG_ASH_GETOPTS is not set
 CONFIG_ASH_BUILTIN_ECHO=y
+CONFIG_ASH_BUILTIN_PRINTF=y
 CONFIG_ASH_BUILTIN_TEST=y
 CONFIG_ASH_CMDCMD=y
 # CONFIG_ASH_MAIL is not set
@@ -782,6 +802,7 @@ CONFIG_ASH_RANDOM_SUPPORT=y
 #
 CONFIG_FEATURE_SH_EXTRA_QUIET=y
 # CONFIG_FEATURE_SH_STANDALONE is not set
+# CONFIG_FEATURE_SH_NOFORK is not set
 # CONFIG_CTTYHACK is not set
 
 #