- up for 1.8.1

Changed files:
    busybox-initrd.config -> 1.38
    busybox.config -> 1.28

diff --git a/busybox-initrd.config b/busybox-initrd.config
index 97bc46d91942b79c3abf18b77c5f480d3c413482..30e22b8eb7ba187f57753ffd29a00cc67ff0b1c6 100644 (file)
--- a/busybox-initrd.config
+++ b/busybox-initrd.config
@@ -59,6 +59,7 @@ CONFIG_INCLUDE_SUSv2=y
 # CONFIG_INSTALL_NO_USR is not set
 # CONFIG_INSTALL_APPLET_SYMLINKS is not set
 # CONFIG_INSTALL_APPLET_HARDLINKS is not set
+# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set
 CONFIG_INSTALL_APPLET_DONT=y
 CONFIG_PREFIX="./_install"
 
@@ -83,6 +84,7 @@ CONFIG_IOCTL_HEX2STR_ERROR=y
 # CONFIG_AR is not set
 # CONFIG_FEATURE_AR_LONG_FILENAMES is not set
 # CONFIG_BUNZIP2 is not set
+# CONFIG_BZIP2 is not set
 # CONFIG_CPIO is not set
 # CONFIG_DPKG is not set
 # CONFIG_DPKG_DEB is not set
@@ -241,6 +243,7 @@ CONFIG_USLEEP=y
 # CONFIG_CLEAR is not set
 # CONFIG_DEALLOCVT is not set
 # CONFIG_DUMPKMAP is not set
+# CONFIG_KBD_MODE is not set
 # CONFIG_LOADFONT is not set
 # CONFIG_LOADKMAP is not set
 # CONFIG_OPENVT is not set
@@ -418,6 +421,7 @@ CONFIG_LOSETUP=y
 # CONFIG_MORE is not set
 # CONFIG_FEATURE_USE_TERMIOS is not set
 CONFIG_MOUNT=y
+# CONFIG_FEATURE_MOUNT_HELPERS is not set
 CONFIG_FEATURE_MOUNT_NFS=y
 # CONFIG_FEATURE_MOUNT_CIFS is not set
 CONFIG_FEATURE_MOUNT_FLAGS=y
@@ -471,9 +475,12 @@ CONFIG_FEATURE_DEVFS=y
 # CONFIG_MAKEDEVS is not set
 # CONFIG_FEATURE_MAKEDEVS_LEAF is not set
 # CONFIG_FEATURE_MAKEDEVS_TABLE is not set
+# CONFIG_MICROCOM is not set
 # CONFIG_MOUNTPOINT is not set
 # CONFIG_MT is not set
 # CONFIG_NMETER is not set
+# CONFIG_PGREP is not set
+# CONFIG_PKILL is not set
 # CONFIG_RAIDAUTORUN is not set
 # CONFIG_READAHEAD is not set
 # CONFIG_RUNLEVEL is not set

diff --git a/busybox.config b/busybox.config
index 8c6c9ba49eef63bb980fd578a0c2659d0a225e49..82d20a332a67cf4bf9ceffe76625707f752da8bc 100644 (file)
--- a/busybox.config
+++ b/busybox.config
@@ -60,6 +60,7 @@ CONFIG_INCLUDE_SUSv2=y
 # CONFIG_INSTALL_NO_USR is not set
 # CONFIG_INSTALL_APPLET_SYMLINKS is not set
 # CONFIG_INSTALL_APPLET_HARDLINKS is not set
+# CONFIG_INSTALL_APPLET_SCRIPT_WRAPPERS is not set
 CONFIG_INSTALL_APPLET_DONT=y
 CONFIG_PREFIX="./_install"
 
@@ -92,6 +93,7 @@ CONFIG_IOCTL_HEX2STR_ERROR=y
 CONFIG_AR=y
 CONFIG_FEATURE_AR_LONG_FILENAMES=y
 CONFIG_BUNZIP2=y
+CONFIG_BZIP2=y
 CONFIG_CPIO=y
 CONFIG_DPKG=y
 CONFIG_DPKG_DEB=y
@@ -271,6 +273,7 @@ CONFIG_CHVT=y
 CONFIG_CLEAR=y
 CONFIG_DEALLOCVT=y
 CONFIG_DUMPKMAP=y
+CONFIG_KBD_MODE=y
 CONFIG_LOADFONT=y
 CONFIG_LOADKMAP=y
 CONFIG_OPENVT=y
@@ -471,6 +474,7 @@ CONFIG_MKSWAP=y
 CONFIG_MORE=y
 CONFIG_FEATURE_USE_TERMIOS=y
 CONFIG_MOUNT=y
+CONFIG_FEATURE_MOUNT_HELPERS=y
 CONFIG_FEATURE_MOUNT_NFS=y
 CONFIG_FEATURE_MOUNT_CIFS=y
 CONFIG_FEATURE_MOUNT_FLAGS=y
@@ -525,9 +529,12 @@ CONFIG_FEATURE_HDPARM_HDIO_DRIVE_RESET=y
 CONFIG_MAKEDEVS=y
 # CONFIG_FEATURE_MAKEDEVS_LEAF is not set
 CONFIG_FEATURE_MAKEDEVS_TABLE=y
+CONFIG_MICROCOM=y
 CONFIG_MOUNTPOINT=y
 CONFIG_MT=y
 CONFIG_NMETER=y
+CONFIG_PGREP=y
+CONFIG_PKILL=y
 CONFIG_RAIDAUTORUN=y
 CONFIG_READAHEAD=y
 CONFIG_RUNLEVEL=y
@@ -555,6 +562,7 @@ CONFIG_FTPPUT=y
 # CONFIG_FEATURE_FTPGETPUT_LONG_OPTIONS is not set
 CONFIG_HOSTNAME=y
 CONFIG_HTTPD=y
+CONFIG_FEATURE_HTTPD_RANGES=y
 # CONFIG_FEATURE_HTTPD_USE_SENDFILE is not set
 CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP=y
 CONFIG_FEATURE_HTTPD_SETUID=y
@@ -566,6 +574,7 @@ CONFIG_FEATURE_HTTPD_CONFIG_WITH_SCRIPT_INTERPR=y
 CONFIG_FEATURE_HTTPD_SET_REMOTE_PORT_TO_ENV=y
 CONFIG_FEATURE_HTTPD_ENCODE_URL_STR=y
 CONFIG_FEATURE_HTTPD_ERROR_PAGES=y
+CONFIG_FEATURE_HTTPD_PROXY=y
 CONFIG_IFCONFIG=y
 CONFIG_FEATURE_IFCONFIG_STATUS=y
 CONFIG_FEATURE_IFCONFIG_SLIP=y
@@ -595,6 +604,7 @@ CONFIG_FEATURE_IP_ROUTE=y
 CONFIG_FEATURE_IP_TUNNEL=y
 CONFIG_FEATURE_IP_RULE=y
 CONFIG_FEATURE_IP_SHORT_FORMS=y
+CONFIG_FEATURE_IP_RARE_PROTOCOLS=y
 CONFIG_IPADDR=y
 CONFIG_IPLINK=y
 CONFIG_IPROUTE=y
@@ -661,6 +671,7 @@ CONFIG_FEATURE_PS_WIDE=y
 CONFIG_RENICE=y
 CONFIG_BB_SYSCTL=y
 CONFIG_TOP=y
+CONFIG_FEATURE_TOPMEM=y
 CONFIG_FEATURE_TOP_CPU_USAGE_PERCENTAGE=y
 CONFIG_FEATURE_TOP_CPU_GLOBAL_PERCENTS=y
 CONFIG_FEATURE_TOP_DECIMALS=y