Sync with waldi's package

git-svn-id: svn://busybox.net/trunk/busybox@6782 69ca8d6d-28ef-0310-b511-8ec308f3f277

8 files changed, 1160 insertions, 247 deletions

diff --git a/debian/changelog b/debian/changelog
index 3c871609a..2da1ea022 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,23 @@
+busybox-cvs (0.60.99.cvs20030405-1) unstable; urgency=low
+
+  * new cvs version
+  * debian/control
+    - add busybox-cvs-net-udeb
+  * debian/rules
+    - arch depend debs
+    - new net-udeb
+  * debian/config*
+    - cleanup applet list
+
+ -- Bastian Blank <waldi@debian.org>  Sat, 05 Apr 2003 11:44:50 +0200
+
+busybox-cvs (0.60.99.cvs20030221-1) unstable; urgency=low
+
+  * new cvs version
+  * enable new applets in udeb
+
+ -- Bastian Blank <waldi@debian.org>  Fri, 21 Feb 2003 23:15:16 +0100
+
 busybox-cvs (0.60.99.cvs20030114-1) unstable; urgency=low
 
   * new cvs version
diff --git a/debian/config-deb b/debian/config-deb
index 00c0db6be..862e06f1f 100644
--- a/debian/config-deb
+++ b/debian/config-deb
@@ -21,11 +21,17 @@ CONFIG_FEATURE_INSTALLER=y
 # Build Options
 #
 # DOSTATIC is not set
-# DOLFS is not set
+DOLFS=y
 # USING_CROSS_COMPILER is not set
 EXTRA_CFLAGS_OPTIONS=""
 
 #
+# Installation Options
+#
+# CONFIG_INSTALL_NO_USR is not set
+PREFIX="./_install"
+
+#
 # Archival Utilities
 #
 CONFIG_AR=y
@@ -44,52 +50,43 @@ CONFIG_FEATURE_TAR_CREATE=y
 # CONFIG_FEATURE_TAR_BZIP2 is not set
 # CONFIG_FEATURE_TAR_EXCLUDE is not set
 CONFIG_FEATURE_TAR_GZIP=y
-# CONFIG_FEATURE_TAR_OLD_FORMAT is not set
-# CONFIG_FEATURE_GNUTAR_LONG_FILENAME is not set
+# CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY is not set
+CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
 # CONFIG_FEATURE_UNARCHIVE_TAPE is not set
 # CONFIG_UNCOMPRESS is not set
 # CONFIG_UNZIP is not set
 
 #
-# Console Utilities
-#
-# CONFIG_CHVT is not set
-CONFIG_CLEAR=y
-# CONFIG_DEALLOCVT is not set
-# CONFIG_DUMPKMAP is not set
-# CONFIG_LOADACM is not set
-# CONFIG_LOADFONT is not set
-CONFIG_LOADKMAP=y
-# CONFIG_OPENVT is not set
-CONFIG_RESET=y
-# CONFIG_SETKEYCODES is not set
-
-#
-# Debian Utilities
-#
-# CONFIG_MKTEMP is not set
-# CONFIG_READLINK is not set
-# CONFIG_RUN_PARTS is not set
-CONFIG_WHICH=y
-
-#
-# Editors
-#
-# CONFIG_AWK is not set
-CONFIG_SED=y
-# CONFIG_VI is not set
-
-#
-# File Utilities
+# Coreutils
 #
+# CONFIG_BASENAME is not set
+# CONFIG_CAL is not set
+CONFIG_CAT=y
+CONFIG_CHGRP=y
 CONFIG_CHMOD=y
 CONFIG_CHOWN=y
-CONFIG_CHGRP=y
+CONFIG_CHROOT=y
+# CONFIG_CMP is not set
 CONFIG_CP=y
+CONFIG_CUT=y
+# CONFIG_DATE is not set
 # CONFIG_DD is not set
 CONFIG_DF=y
+CONFIG_DIRNAME=y
+# CONFIG_DOS2UNIX is not set
 # CONFIG_DU is not set
+CONFIG_ECHO=y
+CONFIG_FEATURE_FANCY_ECHO=y
+# CONFIG_ENV is not set
+CONFIG_EXPR=y
+CONFIG_FALSE=y
+CONFIG_HEAD=y
+# CONFIG_FEATURE_FANCY_HEAD is not set
+# CONFIG_HOSTID is not set
+CONFIG_ID=y
+# CONFIG_LENGTH is not set
 CONFIG_LN=y
+# CONFIG_LOGNAME is not set
 CONFIG_LS=y
 CONFIG_FEATURE_LS_FILETYPES=y
 CONFIG_FEATURE_LS_FOLLOWLINKS=y
@@ -98,14 +95,43 @@ CONFIG_FEATURE_LS_SORTFILES=y
 CONFIG_FEATURE_LS_TIMESTAMPS=y
 CONFIG_FEATURE_LS_USERNAME=y
 CONFIG_FEATURE_LS_COLOR=y
+CONFIG_MD5SUM=y
 CONFIG_MKDIR=y
 # CONFIG_MKFIFO is not set
 CONFIG_MKNOD=y
 CONFIG_MV=y
+# CONFIG_OD is not set
+# CONFIG_PRINTF is not set
+CONFIG_PWD=y
+# CONFIG_REALPATH is not set
 CONFIG_RM=y
 CONFIG_RMDIR=y
+# CONFIG_SHA1SUM is not set
+CONFIG_SLEEP=y
+# CONFIG_FEATURE_FANCY_SLEEP is not set
+CONFIG_SORT=y
+# CONFIG_FEATURE_SORT_REVERSE is not set
+# CONFIG_FEATURE_SORT_UNIQUE is not set
+# CONFIG_STTY is not set
 CONFIG_SYNC=y
+CONFIG_TAIL=y
+CONFIG_FEATURE_FANCY_TAIL=y
+# CONFIG_TEE is not set
+CONFIG_TEST=y
 CONFIG_TOUCH=y
+CONFIG_TR=y
+CONFIG_TRUE=y
+CONFIG_TTY=y
+CONFIG_UNAME=y
+CONFIG_UNIQ=y
+# CONFIG_USLEEP is not set
+# CONFIG_UUDECODE is not set
+# CONFIG_UUENCODE is not set
+# CONFIG_WATCH is not set
+CONFIG_WC=y
+# CONFIG_WHO is not set
+CONFIG_WHOAMI=y
+# CONFIG_YES is not set
 
 #
 # Common options for cp and mv
@@ -123,6 +149,36 @@ CONFIG_FEATURE_AUTOWIDTH=y
 CONFIG_FEATURE_HUMAN_READABLE=y
 
 #
+# Console Utilities
+#
+# CONFIG_CHVT is not set
+CONFIG_CLEAR=y
+# CONFIG_DEALLOCVT is not set
+# CONFIG_DUMPKMAP is not set
+# CONFIG_LOADACM is not set
+# CONFIG_LOADFONT is not set
+CONFIG_LOADKMAP=y
+# CONFIG_OPENVT is not set
+CONFIG_RESET=y
+# CONFIG_SETKEYCODES is not set
+
+#
+# Debian Utilities
+#
+# CONFIG_MKTEMP is not set
+# CONFIG_READLINK is not set
+# CONFIG_RUN_PARTS is not set
+CONFIG_WHICH=y
+
+#
+# Editors
+#
+# CONFIG_AWK is not set
+CONFIG_SED=y
+# CONFIG_FEATURE_SED_EMBEDED_NEWLINE is not set
+# CONFIG_VI is not set
+
+#
 # Finding Utilities
 #
 CONFIG_FIND=y
@@ -130,6 +186,8 @@ CONFIG_FEATURE_FIND_MTIME=y
 CONFIG_FEATURE_FIND_PERM=y
 CONFIG_FEATURE_FIND_TYPE=y
 # CONFIG_FEATURE_FIND_XDEV is not set
+CONFIG_FEATURE_FIND_NEWER=y
+CONFIG_FEATURE_FIND_INUM=y
 CONFIG_GREP=y
 # CONFIG_FEATURE_GREP_EGREP_ALIAS is not set
 # CONFIG_FEATURE_GREP_CONTEXT is not set
@@ -180,7 +238,7 @@ CONFIG_REBOOT=y
 # CONFIG_WATCHDOG is not set
 
 #
-# Module Utilities
+# Linux Module Utilities
 #
 # CONFIG_INSMOD is not set
 # CONFIG_LSMOD is not set
@@ -203,6 +261,7 @@ CONFIG_FEATURE_IFCONFIG_STATUS=y
 CONFIG_FEATURE_IFCONFIG_HW=y
 # CONFIG_FEATURE_IFCONFIG_BROADCAST_PLUS is not set
 # CONFIG_IFUPDOWN is not set
+# CONFIG_INETD is not set
 # CONFIG_IP is not set
 # CONFIG_IPCALC is not set
 # CONFIG_IPADDR is not set
@@ -220,6 +279,7 @@ CONFIG_ROUTE=y
 # CONFIG_TELNETD is not set
 # CONFIG_TFTP is not set
 # CONFIG_TRACEROUTE is not set
+# CONFIG_VCONFIG is not set
 CONFIG_WGET=y
 CONFIG_FEATURE_WGET_STATUSBAR=y
 CONFIG_FEATURE_WGET_AUTHENTICATION=y
@@ -256,66 +316,13 @@ CONFIG_FEATURE_SH_IS_NONE=y
 # CONFIG_MSH is not set
 
 #
-# Shell Utilities
-#
-# CONFIG_BASENAME is not set
-# CONFIG_CAL is not set
-CONFIG_CHROOT=y
-# CONFIG_DATE is not set
-CONFIG_DIRNAME=y
-CONFIG_ECHO=y
-# CONFIG_ENV is not set
-CONFIG_EXPR=y
-CONFIG_FALSE=y
-# CONFIG_HOSTID is not set
-CONFIG_ID=y
-# CONFIG_LOGNAME is not set
-# CONFIG_PRINTF is not set
-CONFIG_PWD=y
-# CONFIG_REALPATH is not set
-CONFIG_SLEEP=y
-# CONFIG_STTY is not set
-# CONFIG_TEE is not set
-CONFIG_TRUE=y
-CONFIG_TEST=y
-CONFIG_TTY=y
-CONFIG_UNAME=y
-# CONFIG_USLEEP is not set
-# CONFIG_WATCH is not set
-# CONFIG_WHO is not set
-CONFIG_WHOAMI=y
-# CONFIG_YES is not set
-
-#
 # System Logging Utilities
 #
-CONFIG_KLOGD=y
-CONFIG_LOGGER=y
 CONFIG_SYSLOGD=y
 # CONFIG_FEATURE_REMOTE_LOG is not set
 # CONFIG_FEATURE_IPC_SYSLOG is not set
-
-#
-# Text Utilities
-#
-CONFIG_CAT=y
-# CONFIG_CMP is not set
-CONFIG_CUT=y
-# CONFIG_DOS2UNIX is not set
-CONFIG_HEAD=y
-# CONFIG_LENGTH is not set
-CONFIG_MD5SUM=y
-# CONFIG_OD is not set
-CONFIG_SORT=y
-# CONFIG_FEATURE_SORT_REVERSE is not set
-# CONFIG_FEATURE_SORT_UNIQUE is not set
-CONFIG_TAIL=y
-CONFIG_FEATURE_FANCY_TAIL=y
-CONFIG_TR=y
-CONFIG_UNIQ=y
-# CONFIG_UUDECODE is not set
-# CONFIG_UUENCODE is not set
-CONFIG_WC=y
+CONFIG_KLOGD=y
+CONFIG_LOGGER=y
 
 #
 # Linux System Utilities
diff --git a/debian/config-net-udeb-i386 b/debian/config-net-udeb-i386
new file mode 100644
index 000000000..923f61485
--- /dev/null
+++ b/debian/config-net-udeb-i386
@@ -0,0 +1,369 @@
+#
+# Automatically generated make config: don't edit
+#
+HAVE_DOT_CONFIG=y
+
+#
+# General Configuration
+#
+# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set
+CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y
+# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
+# CONFIG_FEATURE_VERBOSE_USAGE is not set
+# CONFIG_FEATURE_INSTALLER is not set
+# CONFIG_LOCALE_SUPPORT is not set
+CONFIG_FEATURE_DEVFS=y
+CONFIG_FEATURE_DEVPTS=y
+# CONFIG_FEATURE_CLEAN_UP is not set
+# CONFIG_FEATURE_SUID is not set
+
+#
+# Build Options
+#
+# DOSTATIC is not set
+DOLFS=y
+# USING_CROSS_COMPILER is not set
+EXTRA_CFLAGS_OPTIONS=""
+
+#
+# Installation Options
+#
+# CONFIG_INSTALL_NO_USR is not set
+PREFIX="./_install"
+
+#
+# Archival Utilities
+#
+CONFIG_AR=y
+# CONFIG_FEATURE_AR_LONG_FILENAMES is not set
+# CONFIG_BUNZIP2 is not set
+# CONFIG_CPIO is not set
+# CONFIG_DPKG is not set
+# CONFIG_DPKG_DEB is not set
+CONFIG_GUNZIP=y
+# CONFIG_FEATURE_GUNZIP_UNCOMPRESS is not set
+# CONFIG_GZIP is not set
+# CONFIG_RPM2CPIO is not set
+# CONFIG_RPM is not set
+CONFIG_TAR=y
+# CONFIG_FEATURE_TAR_CREATE is not set
+# CONFIG_FEATURE_TAR_BZIP2 is not set
+# CONFIG_FEATURE_TAR_EXCLUDE is not set
+CONFIG_FEATURE_TAR_GZIP=y
+# CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY is not set
+CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
+# CONFIG_FEATURE_UNARCHIVE_TAPE is not set
+# CONFIG_UNCOMPRESS is not set
+# CONFIG_UNZIP is not set
+
+#
+# Coreutils
+#
+# CONFIG_BASENAME is not set
+# CONFIG_CAL is not set
+CONFIG_CAT=y
+# CONFIG_CHGRP is not set
+# CONFIG_CHMOD is not set
+CONFIG_CHOWN=y
+CONFIG_CHROOT=y
+# CONFIG_CMP is not set
+# CONFIG_CP is not set
+CONFIG_CUT=y
+# CONFIG_DATE is not set
+# CONFIG_DD is not set
+# CONFIG_DF is not set
+# CONFIG_DIRNAME is not set
+# CONFIG_DOS2UNIX is not set
+# CONFIG_DU is not set
+CONFIG_ECHO=y
+CONFIG_FEATURE_FANCY_ECHO=y
+# CONFIG_ENV is not set
+# CONFIG_EXPR is not set
+CONFIG_FALSE=y
+# CONFIG_HEAD is not set
+# CONFIG_HOSTID is not set
+# CONFIG_ID is not set
+# CONFIG_LENGTH is not set
+CONFIG_LN=y
+# CONFIG_LOGNAME is not set
+# CONFIG_LS is not set
+CONFIG_MD5SUM=y
+CONFIG_MKDIR=y
+# CONFIG_MKFIFO is not set
+# CONFIG_MKNOD is not set
+# CONFIG_MV is not set
+# CONFIG_OD is not set
+# CONFIG_PRINTF is not set
+# CONFIG_PWD is not set
+# CONFIG_REALPATH is not set
+CONFIG_RM=y
+# CONFIG_RMDIR is not set
+# CONFIG_SHA1SUM is not set
+# CONFIG_SLEEP is not set
+# CONFIG_SORT is not set
+# CONFIG_STTY is not set
+CONFIG_SYNC=y
+# CONFIG_TAIL is not set
+# CONFIG_TEE is not set
+CONFIG_TEST=y
+
+#
+# test (forced enabled for use with shell)
+#
+CONFIG_TOUCH=y
+# CONFIG_TR is not set
+CONFIG_TRUE=y
+# CONFIG_TTY is not set
+# CONFIG_UNAME is not set
+# CONFIG_UNIQ is not set
+# CONFIG_USLEEP is not set
+# CONFIG_UUDECODE is not set
+# CONFIG_UUENCODE is not set
+# CONFIG_WATCH is not set
+CONFIG_WC=y
+# CONFIG_WHO is not set
+# CONFIG_WHOAMI is not set
+# CONFIG_YES is not set
+
+#
+# Console Utilities
+#
+# CONFIG_CHVT is not set
+# CONFIG_CLEAR is not set
+# CONFIG_DEALLOCVT is not set
+# CONFIG_DUMPKMAP is not set
+# CONFIG_LOADACM is not set
+# CONFIG_LOADFONT is not set
+# CONFIG_LOADKMAP is not set
+# CONFIG_OPENVT is not set
+# CONFIG_RESET is not set
+# CONFIG_SETKEYCODES is not set
+
+#
+# Debian Utilities
+#
+# CONFIG_MKTEMP is not set
+# CONFIG_READLINK is not set
+# CONFIG_RUN_PARTS is not set
+# CONFIG_WHICH is not set
+
+#
+# Editors
+#
+# CONFIG_AWK is not set
+CONFIG_SED=y
+# CONFIG_FEATURE_SED_EMBEDED_NEWLINE is not set
+# CONFIG_VI is not set
+
+#
+# Finding Utilities
+#
+# CONFIG_FIND is not set
+CONFIG_GREP=y
+# CONFIG_FEATURE_GREP_EGREP_ALIAS is not set
+# CONFIG_FEATURE_GREP_CONTEXT is not set
+# CONFIG_XARGS is not set
+
+#
+# Init Utilities
+#
+CONFIG_INIT=y
+CONFIG_FEATURE_USE_INITTAB=y
+CONFIG_FEATURE_INITRD=y
+# CONFIG_FEATURE_INIT_COREDUMPS is not set
+# CONFIG_FEATURE_EXTRA_QUIET is not set
+# CONFIG_HALT is not set
+# CONFIG_POWEROFF is not set
+CONFIG_REBOOT=y
+# CONFIG_START_STOP_DAEMON is not set
+# CONFIG_MESG is not set
+
+#
+# Login/Password Management Utilities
+#
+# CONFIG_USE_BB_PWD_GRP is not set
+# CONFIG_ADDGROUP is not set
+# CONFIG_DELGROUP is not set
+# CONFIG_ADDUSER is not set
+# CONFIG_DELUSER is not set
+# CONFIG_GETTY is not set
+# CONFIG_LOGIN is not set
+# CONFIG_PASSWD is not set
+# CONFIG_SU is not set
+# CONFIG_SULOGIN is not set
+# CONFIG_VLOCK is not set
+
+#
+# Miscellaneous Utilities
+#
+# CONFIG_ADJTIMEX is not set
+# CONFIG_CROND is not set
+# CONFIG_CRONTAB is not set
+# CONFIG_DC is not set
+# CONFIG_DUTMP is not set
+# CONFIG_MAKEDEVS is not set
+# CONFIG_MT is not set
+# CONFIG_STRINGS is not set
+# CONFIG_TIME is not set
+# CONFIG_UPDATE is not set
+# CONFIG_WATCHDOG is not set
+
+#
+# Linux Module Utilities
+#
+CONFIG_INSMOD=y
+# CONFIG_FEATURE_OLD_MODULE_INTERFACE is not set
+CONFIG_FEATURE_NEW_MODULE_INTERFACE=y
+
+#
+#   Support new (post 2.1) Linux kernels (Forced enabled)
+#
+# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
+# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
+# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
+# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
+# CONFIG_LSMOD is not set
+# CONFIG_MODPROBE is not set
+# CONFIG_RMMOD is not set
+CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
+
+#
+# Networking Utilities
+#
+# CONFIG_FEATURE_IPV6 is not set
+# CONFIG_ARPING is not set
+# CONFIG_FTPGET is not set
+# CONFIG_FTPPUT is not set
+# CONFIG_HOSTNAME is not set
+# CONFIG_HTTPD is not set
+# CONFIG_IFCONFIG is not set
+# CONFIG_IFUPDOWN is not set
+# CONFIG_INETD is not set
+CONFIG_IP=y
+CONFIG_FEATURE_IP_ADDRESS=y
+CONFIG_FEATURE_IP_LINK=y
+CONFIG_FEATURE_IP_ROUTE=y
+# CONFIG_FEATURE_IP_TUNNEL is not set
+# CONFIG_IPCALC is not set
+# CONFIG_IPADDR is not set
+# CONFIG_IPLINK is not set
+# CONFIG_IPROUTE is not set
+# CONFIG_IPTUNNEL is not set
+# CONFIG_NAMEIF is not set
+# CONFIG_NC is not set
+# CONFIG_NETSTAT is not set
+# CONFIG_NSLOOKUP is not set
+# CONFIG_PING is not set
+# CONFIG_ROUTE is not set
+# CONFIG_TELNET is not set
+# CONFIG_TELNETD is not set
+# CONFIG_TFTP is not set
+# CONFIG_TRACEROUTE is not set
+# CONFIG_VCONFIG is not set
+CONFIG_WGET=y
+# CONFIG_FEATURE_WGET_STATUSBAR is not set
+CONFIG_FEATURE_WGET_AUTHENTICATION=y
+
+#
+# udhcp Server/Client
+#
+# CONFIG_UDHCPD is not set
+CONFIG_UDHCPC=y
+CONFIG_FEATURE_UDHCP_SYSLOG=y
+# CONFIG_FEATURE_UDHCP_DEBUG is not set
+
+#
+# Process Utilities
+#
+# CONFIG_FREE is not set
+# CONFIG_KILL is not set
+# CONFIG_PIDOF is not set
+# CONFIG_PS is not set
+# CONFIG_RENICE is not set
+# CONFIG_TOP is not set
+# CONFIG_UPTIME is not set
+
+#
+# Another Bourne-like Shell
+#
+CONFIG_FEATURE_SH_IS_ASH=y
+# CONFIG_FEATURE_SH_IS_HUSH is not set
+# CONFIG_FEATURE_SH_IS_LASH is not set
+# CONFIG_FEATURE_SH_IS_MSH is not set
+# CONFIG_FEATURE_SH_IS_NONE is not set
+CONFIG_ASH=y
+
+#
+# ash (forced enabled as default shell)
+#
+
+#
+# Ash Shell Options
+#
+# CONFIG_ASH_JOB_CONTROL is not set
+# CONFIG_ASH_ALIAS is not set
+CONFIG_ASH_MATH_SUPPORT=y
+# CONFIG_ASH_GETOPTS is not set
+# CONFIG_ASH_CMDCMD is not set
+# CONFIG_ASH_MAIL is not set
+CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
+# CONFIG_HUSH is not set
+# CONFIG_LASH is not set
+# CONFIG_MSH is not set
+
+#
+# Bourne Shell Options
+#
+CONFIG_FEATURE_COMMAND_EDITING=y
+# CONFIG_FEATURE_COMMAND_SAVEHISTORY is not set
+# CONFIG_FEATURE_COMMAND_TAB_COMPLETION is not set
+# CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION is not set
+CONFIG_FEATURE_COMMAND_HISTORY=15
+# CONFIG_FEATURE_SH_STANDALONE_SHELL is not set
+# CONFIG_FEATURE_SH_APPLETS_ALWAYS_WIN is not set
+# CONFIG_FEATURE_SH_FANCY_PROMPT is not set
+# CONFIG_FEATURE_SH_EXTRA_QUIET is not set
+
+#
+# System Logging Utilities
+#
+CONFIG_SYSLOGD=y
+# CONFIG_FEATURE_REMOTE_LOG is not set
+# CONFIG_FEATURE_IPC_SYSLOG is not set
+CONFIG_KLOGD=y
+# CONFIG_LOGGER is not set
+
+#
+# Linux System Utilities
+#
+# CONFIG_DMESG is not set
+# CONFIG_FBSET is not set
+# CONFIG_FDFLUSH is not set
+# CONFIG_FDISK is not set
+# CONFIG_FREERAMDISK is not set
+# CONFIG_FSCK_MINIX is not set
+# CONFIG_MKFS_MINIX is not set
+# CONFIG_GETOPT is not set
+# CONFIG_HEXDUMP is not set
+# CONFIG_HWCLOCK is not set
+# CONFIG_LOSETUP is not set
+# CONFIG_MKSWAP is not set
+# CONFIG_MORE is not set
+CONFIG_PIVOT_ROOT=y
+# CONFIG_RDATE is not set
+# CONFIG_SWAPONOFF is not set
+CONFIG_MOUNT=y
+# CONFIG_NFSMOUNT is not set
+CONFIG_UMOUNT=y
+CONFIG_FEATURE_MOUNT_FORCE=y
+
+#
+# Common options for mount/umount
+#
+# CONFIG_FEATURE_MOUNT_LOOP is not set
+# CONFIG_FEATURE_MTAB_SUPPORT is not set
+
+#
+# Debugging Options
+#
+# DODEBUG is not set
diff --git a/debian/config-static b/debian/config-static
index 45238704c..082c46da9 100644
--- a/debian/config-static
+++ b/debian/config-static
@@ -26,6 +26,12 @@ DOLFS=y
 EXTRA_CFLAGS_OPTIONS=""
 
 #
+# Installation Options
+#
+# CONFIG_INSTALL_NO_USR is not set
+PREFIX="./_install"
+
+#
 # Archival Utilities
 #
 CONFIG_AR=y
@@ -47,63 +53,49 @@ CONFIG_FEATURE_TAR_CREATE=y
 CONFIG_FEATURE_TAR_BZIP2=y
 CONFIG_FEATURE_TAR_EXCLUDE=y
 CONFIG_FEATURE_TAR_GZIP=y
-CONFIG_FEATURE_TAR_OLD_FORMAT=y
-CONFIG_FEATURE_GNUTAR_LONG_FILENAME=y
+# CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY is not set
+CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
 CONFIG_FEATURE_UNARCHIVE_TAPE=y
 CONFIG_UNCOMPRESS=y
 CONFIG_UNZIP=y
 
 #
-# Console Utilities
-#
-CONFIG_CHVT=y
-CONFIG_CLEAR=y
-CONFIG_DEALLOCVT=y
-CONFIG_DUMPKMAP=y
-CONFIG_LOADACM=y
-CONFIG_LOADFONT=y
-CONFIG_LOADKMAP=y
-CONFIG_OPENVT=y
-CONFIG_RESET=y
-CONFIG_SETKEYCODES=y
-
-#
-# Debian Utilities
-#
-CONFIG_MKTEMP=y
-CONFIG_READLINK=y
-CONFIG_RUN_PARTS=y
-CONFIG_WHICH=y
-
-#
-# Editors
-#
-CONFIG_AWK=y
-CONFIG_FEATURE_AWK_MATH=y
-CONFIG_SED=y
-CONFIG_VI=y
-CONFIG_FEATURE_VI_COLON=y
-CONFIG_FEATURE_VI_YANKMARK=y
-CONFIG_FEATURE_VI_SEARCH=y
-CONFIG_FEATURE_VI_USE_SIGNALS=y
-CONFIG_FEATURE_VI_DOT_CMD=y
-CONFIG_FEATURE_VI_READONLY=y
-CONFIG_FEATURE_VI_SETOPTS=y
-CONFIG_FEATURE_VI_SET=y
-CONFIG_FEATURE_VI_WIN_RESIZE=y
-CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
-
-#
-# File Utilities
+# Coreutils
 #
+CONFIG_BASENAME=y
+CONFIG_CAL=y
+CONFIG_CAT=y
+CONFIG_CHGRP=y
 CONFIG_CHMOD=y
 CONFIG_CHOWN=y
-CONFIG_CHGRP=y
+CONFIG_CHROOT=y
+CONFIG_CMP=y
 CONFIG_CP=y
+CONFIG_CUT=y
+CONFIG_DATE=y
+
+#
+# date (forced enabled for use with watch)
+#
+CONFIG_FEATURE_DATE_ISOFMT=y
 CONFIG_DD=y
 CONFIG_DF=y
+CONFIG_DIRNAME=y
+CONFIG_DOS2UNIX=y
 CONFIG_DU=y
+CONFIG_FEATURE_DU_DEFALT_BLOCKSIZE_1K=y
+CONFIG_ECHO=y
+CONFIG_FEATURE_FANCY_ECHO=y
+CONFIG_ENV=y
+CONFIG_EXPR=y
+CONFIG_FALSE=y
+CONFIG_HEAD=y
+# CONFIG_FEATURE_FANCY_HEAD is not set
+CONFIG_HOSTID=y
+CONFIG_ID=y
+CONFIG_LENGTH=y
 CONFIG_LN=y
+CONFIG_LOGNAME=y
 CONFIG_LS=y
 CONFIG_FEATURE_LS_FILETYPES=y
 CONFIG_FEATURE_LS_FOLLOWLINKS=y
@@ -112,14 +104,48 @@ CONFIG_FEATURE_LS_SORTFILES=y
 CONFIG_FEATURE_LS_TIMESTAMPS=y
 CONFIG_FEATURE_LS_USERNAME=y
 CONFIG_FEATURE_LS_COLOR=y
+CONFIG_MD5SUM=y
 CONFIG_MKDIR=y
 CONFIG_MKFIFO=y
 CONFIG_MKNOD=y
 CONFIG_MV=y
+CONFIG_OD=y
+CONFIG_PRINTF=y
+CONFIG_PWD=y
+# CONFIG_REALPATH is not set
 CONFIG_RM=y
 CONFIG_RMDIR=y
+# CONFIG_SHA1SUM is not set
+CONFIG_SLEEP=y
+# CONFIG_FEATURE_FANCY_SLEEP is not set
+CONFIG_SORT=y
+CONFIG_FEATURE_SORT_REVERSE=y
+CONFIG_FEATURE_SORT_UNIQUE=y
+CONFIG_STTY=y
 CONFIG_SYNC=y
+CONFIG_TAIL=y
+CONFIG_FEATURE_FANCY_TAIL=y
+CONFIG_TEE=y
+# CONFIG_FEATURE_TEE_USE_BLOCK_IO is not set
+CONFIG_TEST=y
+
+#
+# test (forced enabled for use with shell)
+#
 CONFIG_TOUCH=y
+CONFIG_TR=y
+CONFIG_TRUE=y
+CONFIG_TTY=y
+CONFIG_UNAME=y
+CONFIG_UNIQ=y
+CONFIG_USLEEP=y
+CONFIG_UUDECODE=y
+CONFIG_UUENCODE=y
+CONFIG_WATCH=y
+CONFIG_WC=y
+CONFIG_WHO=y
+CONFIG_WHOAMI=y
+CONFIG_YES=y
 
 #
 # Common options for cp and mv
@@ -137,6 +163,47 @@ CONFIG_FEATURE_AUTOWIDTH=y
 CONFIG_FEATURE_HUMAN_READABLE=y
 
 #
+# Console Utilities
+#
+CONFIG_CHVT=y
+CONFIG_CLEAR=y
+CONFIG_DEALLOCVT=y
+CONFIG_DUMPKMAP=y
+CONFIG_LOADACM=y
+CONFIG_LOADFONT=y
+CONFIG_LOADKMAP=y
+CONFIG_OPENVT=y
+CONFIG_RESET=y
+CONFIG_SETKEYCODES=y
+
+#
+# Debian Utilities
+#
+CONFIG_MKTEMP=y
+CONFIG_READLINK=y
+CONFIG_RUN_PARTS=y
+CONFIG_WHICH=y
+
+#
+# Editors
+#
+CONFIG_AWK=y
+CONFIG_FEATURE_AWK_MATH=y
+CONFIG_SED=y
+# CONFIG_FEATURE_SED_EMBEDED_NEWLINE is not set
+CONFIG_VI=y
+CONFIG_FEATURE_VI_COLON=y
+CONFIG_FEATURE_VI_YANKMARK=y
+CONFIG_FEATURE_VI_SEARCH=y
+CONFIG_FEATURE_VI_USE_SIGNALS=y
+CONFIG_FEATURE_VI_DOT_CMD=y
+CONFIG_FEATURE_VI_READONLY=y
+CONFIG_FEATURE_VI_SETOPTS=y
+CONFIG_FEATURE_VI_SET=y
+CONFIG_FEATURE_VI_WIN_RESIZE=y
+CONFIG_FEATURE_VI_OPTIMIZE_CURSOR=y
+
+#
 # Finding Utilities
 #
 CONFIG_FIND=y
@@ -144,6 +211,8 @@ CONFIG_FEATURE_FIND_MTIME=y
 CONFIG_FEATURE_FIND_PERM=y
 CONFIG_FEATURE_FIND_TYPE=y
 CONFIG_FEATURE_FIND_XDEV=y
+CONFIG_FEATURE_FIND_NEWER=y
+CONFIG_FEATURE_FIND_INUM=y
 CONFIG_GREP=y
 CONFIG_FEATURE_GREP_EGREP_ALIAS=y
 CONFIG_FEATURE_GREP_CONTEXT=y
@@ -176,12 +245,16 @@ CONFIG_LOGIN=y
 CONFIG_FEATURE_SECURETTY=y
 CONFIG_PASSWD=y
 CONFIG_SU=y
-CONFIG_FEATURE_SHADOWPASSWDS=y
-CONFIG_USE_BB_SHADOW=y
 CONFIG_SULOGIN=y
 CONFIG_VLOCK=y
 
 #
+# Common options for adduser, deluser, login, su
+#
+CONFIG_FEATURE_SHADOWPASSWDS=y
+CONFIG_USE_BB_SHADOW=y
+
+#
 # Miscellaneous Utilities
 #
 CONFIG_ADJTIMEX=y
@@ -197,7 +270,7 @@ CONFIG_UPDATE=y
 CONFIG_WATCHDOG=y
 
 #
-# Module Utilities
+# Linux Module Utilities
 #
 # CONFIG_INSMOD is not set
 # CONFIG_LSMOD is not set
@@ -213,7 +286,14 @@ CONFIG_FTPGET=y
 CONFIG_FTPPUT=y
 CONFIG_HOSTNAME=y
 CONFIG_HTTPD=y
+# CONFIG_FEATURE_HTTPD_USAGE_FROM_INETD_ONLY is not set
 CONFIG_FEATURE_HTTPD_BASIC_AUTH=y
+# CONFIG_FEATURE_HTTPD_CGI is not set
+# CONFIG_FEATURE_HTTPD_RELOAD_CONFIG_SIGHUP is not set
+# CONFIG_FEATURE_HTTPD_SETUID is not set
+# CONFIG_FEATURE_HTTPD_CONFIG_WITH_MIME_TYPES is not set
+# CONFIG_FEATURE_HTTPD_DECODE_URL_STR is not set
+# CONFIG_FEATURE_HTTPD_ENCODE_URL_STR is not set
 CONFIG_IFCONFIG=y
 CONFIG_FEATURE_IFCONFIG_STATUS=y
 CONFIG_FEATURE_IFCONFIG_SLIP=y
@@ -226,6 +306,7 @@ CONFIG_FEATURE_IFUPDOWN_IPV4=y
 CONFIG_FEATURE_IFUPDOWN_IPV6=y
 CONFIG_FEATURE_IFUPDOWN_IPX=y
 CONFIG_FEATURE_IFUPDOWN_MAPPING=y
+# CONFIG_INETD is not set
 CONFIG_IP=y
 CONFIG_FEATURE_IP_ADDRESS=y
 
@@ -265,6 +346,7 @@ CONFIG_ROUTE=y
 CONFIG_TELNET=y
 CONFIG_FEATURE_TELNET_TTYPE=y
 CONFIG_TELNETD=y
+# CONFIG_FEATURE_TELNETD_INETD is not set
 CONFIG_TFTP=y
 CONFIG_FEATURE_TFTP_GET=y
 CONFIG_FEATURE_TFTP_PUT=y
@@ -273,6 +355,7 @@ CONFIG_FEATURE_TFTP_DEBUG=y
 CONFIG_TRACEROUTE=y
 CONFIG_FEATURE_TRACEROUTE_VERBOSE=y
 CONFIG_FEATURE_TRACEROUTE_SO_DEBUG=y
+# CONFIG_VCONFIG is not set
 CONFIG_WGET=y
 CONFIG_FEATURE_WGET_STATUSBAR=y
 CONFIG_FEATURE_WGET_AUTHENTICATION=y
@@ -341,76 +424,14 @@ CONFIG_FEATURE_SH_FANCY_PROMPT=y
 # CONFIG_FEATURE_SH_EXTRA_QUIET is not set
 
 #
-# Shell Utilities
-#
-CONFIG_BASENAME=y
-CONFIG_CAL=y
-CONFIG_CHROOT=y
-CONFIG_DATE=y
-
-#
-# date (forced enabled for use with watch)
-#
-CONFIG_FEATURE_DATE_ISOFMT=y
-CONFIG_DIRNAME=y
-CONFIG_ECHO=y
-CONFIG_ENV=y
-CONFIG_EXPR=y
-CONFIG_FALSE=y
-CONFIG_HOSTID=y
-CONFIG_ID=y
-CONFIG_LOGNAME=y
-CONFIG_PRINTF=y
-CONFIG_PWD=y
-# CONFIG_REALPATH is not set
-CONFIG_SLEEP=y
-CONFIG_STTY=y
-CONFIG_TEE=y
-CONFIG_TRUE=y
-CONFIG_TEST=y
-
-#
-# test (forced enabled for use with shell)
-#
-CONFIG_TTY=y
-CONFIG_UNAME=y
-CONFIG_USLEEP=y
-CONFIG_WATCH=y
-CONFIG_WHO=y
-CONFIG_WHOAMI=y
-CONFIG_YES=y
-
-#
 # System Logging Utilities
 #
-CONFIG_KLOGD=y
-CONFIG_LOGGER=y
 CONFIG_SYSLOGD=y
 CONFIG_FEATURE_REMOTE_LOG=y
 CONFIG_FEATURE_IPC_SYSLOG=y
 CONFIG_LOGREAD=y
-
-#
-# Text Utilities
-#
-CONFIG_CAT=y
-CONFIG_CMP=y
-CONFIG_CUT=y
-CONFIG_DOS2UNIX=y
-CONFIG_HEAD=y
-CONFIG_LENGTH=y
-CONFIG_MD5SUM=y
-CONFIG_OD=y
-CONFIG_SORT=y
-CONFIG_FEATURE_SORT_REVERSE=y
-CONFIG_FEATURE_SORT_UNIQUE=y
-CONFIG_TAIL=y
-CONFIG_FEATURE_FANCY_TAIL=y
-CONFIG_TR=y
-CONFIG_UNIQ=y
-CONFIG_UUDECODE=y
-CONFIG_UUENCODE=y
-CONFIG_WC=y
+CONFIG_KLOGD=y
+CONFIG_LOGGER=y
 
 #
 # Linux System Utilities
@@ -460,6 +481,7 @@ CONFIG_FEATURE_MOUNT_FORCE=y
 #
 CONFIG_FEATURE_MOUNT_LOOP=y
 CONFIG_FEATURE_MTAB_SUPPORT=y
+CONFIG_FEATURE_MTAB_FILENAME="/etc/mtab"
 
 #
 # Debugging Options
diff --git a/debian/config-udeb b/debian/config-udeb
index c11ae5612..0d42f4317 100644
--- a/debian/config-udeb
+++ b/debian/config-udeb
@@ -21,7 +21,7 @@ CONFIG_FEATURE_DEVPTS=y
 # Build Options
 #
 # DOSTATIC is not set
-# DOLFS is not set
+DOLFS=y
 # USING_CROSS_COMPILER is not set
 EXTRA_CFLAGS_OPTIONS=""
 
@@ -95,7 +95,7 @@ CONFIG_FEATURE_LS_SORTFILES=y
 CONFIG_FEATURE_LS_TIMESTAMPS=y
 CONFIG_FEATURE_LS_USERNAME=y
 # CONFIG_FEATURE_LS_COLOR is not set
-# CONFIG_MD5SUM is not set
+CONFIG_MD5SUM=y
 CONFIG_MKDIR=y
 # CONFIG_MKFIFO is not set
 CONFIG_MKNOD=y
@@ -154,7 +154,7 @@ CONFIG_FEATURE_HUMAN_READABLE=y
 #
 # Console Utilities
 #
-CONFIG_CHVT=y
+# CONFIG_CHVT is not set
 # CONFIG_CLEAR is not set
 # CONFIG_DEALLOCVT is not set
 # CONFIG_DUMPKMAP is not set
@@ -185,12 +185,12 @@ CONFIG_SED=y
 # Finding Utilities
 #
 CONFIG_FIND=y
-# CONFIG_FEATURE_FIND_MTIME is not set
-# CONFIG_FEATURE_FIND_PERM is not set
-# CONFIG_FEATURE_FIND_TYPE is not set
-# CONFIG_FEATURE_FIND_XDEV is not set
-# CONFIG_FEATURE_FIND_NEWER is not set
-# CONFIG_FEATURE_FIND_INUM is not set
+CONFIG_FEATURE_FIND_MTIME=y
+CONFIG_FEATURE_FIND_PERM=y
+CONFIG_FEATURE_FIND_TYPE=y
+CONFIG_FEATURE_FIND_XDEV=y
+CONFIG_FEATURE_FIND_NEWER=y
+CONFIG_FEATURE_FIND_INUM=y
 CONFIG_GREP=y
 # CONFIG_FEATURE_GREP_EGREP_ALIAS is not set
 # CONFIG_FEATURE_GREP_CONTEXT is not set
@@ -274,19 +274,16 @@ CONFIG_FEATURE_IP_ROUTE=y
 # CONFIG_NC is not set
 # CONFIG_NETSTAT is not set
 # CONFIG_NSLOOKUP is not set
-CONFIG_PING=y
-CONFIG_FEATURE_FANCY_PING=y
+# CONFIG_PING is not set
 # CONFIG_ROUTE is not set
-CONFIG_TELNET=y
-CONFIG_FEATURE_TELNET_TTYPE=y
-CONFIG_TELNETD=y
-# CONFIG_FEATURE_TELNETD_INETD is not set
+# CONFIG_TELNET is not set
+# CONFIG_TELNETD is not set
 # CONFIG_TFTP is not set
 # CONFIG_TRACEROUTE is not set
 # CONFIG_VCONFIG is not set
 CONFIG_WGET=y
-CONFIG_FEATURE_WGET_STATUSBAR=y
-# CONFIG_FEATURE_WGET_AUTHENTICATION is not set
+# CONFIG_FEATURE_WGET_STATUSBAR is not set
+CONFIG_FEATURE_WGET_AUTHENTICATION=y
 
 #
 # udhcp Server/Client
@@ -325,8 +322,8 @@ CONFIG_ASH=y
 #
 # Ash Shell Options
 #
-CONFIG_ASH_JOB_CONTROL=y
-CONFIG_ASH_ALIAS=y
+# CONFIG_ASH_JOB_CONTROL is not set
+# CONFIG_ASH_ALIAS is not set
 CONFIG_ASH_MATH_SUPPORT=y
 # CONFIG_ASH_GETOPTS is not set
 # CONFIG_ASH_CMDCMD is not set
@@ -365,7 +362,7 @@ CONFIG_DMESG=y
 # CONFIG_FBSET is not set
 # CONFIG_FDFLUSH is not set
 # CONFIG_FDISK is not set
-CONFIG_FREERAMDISK=y
+# CONFIG_FREERAMDISK is not set
 # CONFIG_FSCK_MINIX is not set
 # CONFIG_MKFS_MINIX is not set
 # CONFIG_GETOPT is not set
@@ -383,14 +380,14 @@ CONFIG_PIVOT_ROOT=y
 # CONFIG_RDATE is not set
 CONFIG_SWAPONOFF=y
 CONFIG_MOUNT=y
-CONFIG_NFSMOUNT=y
+# CONFIG_NFSMOUNT is not set
 CONFIG_UMOUNT=y
 CONFIG_FEATURE_MOUNT_FORCE=y
 
 #
 # Common options for mount/umount
 #
-CONFIG_FEATURE_MOUNT_LOOP=y
+# CONFIG_FEATURE_MOUNT_LOOP is not set
 # CONFIG_FEATURE_MTAB_SUPPORT is not set
 
 #
diff --git a/debian/config-udeb-i386 b/debian/config-udeb-i386
new file mode 100644
index 000000000..8861395f8
--- /dev/null
+++ b/debian/config-udeb-i386
@@ -0,0 +1,408 @@
+#
+# Automatically generated make config: don't edit
+#
+HAVE_DOT_CONFIG=y
+
+#
+# General Configuration
+#
+# CONFIG_FEATURE_BUFFERS_USE_MALLOC is not set
+CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y
+# CONFIG_FEATURE_BUFFERS_GO_IN_BSS is not set
+# CONFIG_FEATURE_VERBOSE_USAGE is not set
+# CONFIG_FEATURE_INSTALLER is not set
+# CONFIG_LOCALE_SUPPORT is not set
+CONFIG_FEATURE_DEVFS=y
+CONFIG_FEATURE_DEVPTS=y
+# CONFIG_FEATURE_CLEAN_UP is not set
+# CONFIG_FEATURE_SUID is not set
+
+#
+# Build Options
+#
+# DOSTATIC is not set
+DOLFS=y
+# USING_CROSS_COMPILER is not set
+EXTRA_CFLAGS_OPTIONS=""
+
+#
+# Installation Options
+#
+# CONFIG_INSTALL_NO_USR is not set
+PREFIX="./_install"
+
+#
+# Archival Utilities
+#
+CONFIG_AR=y
+# CONFIG_FEATURE_AR_LONG_FILENAMES is not set
+# CONFIG_BUNZIP2 is not set
+# CONFIG_CPIO is not set
+# CONFIG_DPKG is not set
+# CONFIG_DPKG_DEB is not set
+CONFIG_GUNZIP=y
+# CONFIG_FEATURE_GUNZIP_UNCOMPRESS is not set
+# CONFIG_GZIP is not set
+# CONFIG_RPM2CPIO is not set
+# CONFIG_RPM is not set
+CONFIG_TAR=y
+# CONFIG_FEATURE_TAR_CREATE is not set
+# CONFIG_FEATURE_TAR_BZIP2 is not set
+# CONFIG_FEATURE_TAR_EXCLUDE is not set
+CONFIG_FEATURE_TAR_GZIP=y
+# CONFIG_FEATURE_TAR_OLDGNU_COMPATABILITY is not set
+CONFIG_FEATURE_TAR_GNU_EXTENSIONS=y
+# CONFIG_FEATURE_UNARCHIVE_TAPE is not set
+# CONFIG_UNCOMPRESS is not set
+# CONFIG_UNZIP is not set
+
+#
+# Coreutils
+#
+CONFIG_BASENAME=y
+# CONFIG_CAL is not set
+CONFIG_CAT=y
+# CONFIG_CHGRP is not set
+CONFIG_CHMOD=y
+CONFIG_CHOWN=y
+CONFIG_CHROOT=y
+# CONFIG_CMP is not set
+CONFIG_CP=y
+CONFIG_CUT=y
+# CONFIG_DATE is not set
+# CONFIG_DD is not set
+CONFIG_DF=y
+CONFIG_DIRNAME=y
+# CONFIG_DOS2UNIX is not set
+# CONFIG_DU is not set
+CONFIG_ECHO=y
+CONFIG_FEATURE_FANCY_ECHO=y
+CONFIG_ENV=y
+CONFIG_EXPR=y
+CONFIG_FALSE=y
+CONFIG_HEAD=y
+# CONFIG_FEATURE_FANCY_HEAD is not set
+# CONFIG_HOSTID is not set
+CONFIG_ID=y
+# CONFIG_LENGTH is not set
+CONFIG_LN=y
+# CONFIG_LOGNAME is not set
+CONFIG_LS=y
+# CONFIG_FEATURE_LS_FILETYPES is not set
+CONFIG_FEATURE_LS_FOLLOWLINKS=y
+# CONFIG_FEATURE_LS_RECURSIVE is not set
+CONFIG_FEATURE_LS_SORTFILES=y
+CONFIG_FEATURE_LS_TIMESTAMPS=y
+CONFIG_FEATURE_LS_USERNAME=y
+# CONFIG_FEATURE_LS_COLOR is not set
+CONFIG_MD5SUM=y
+CONFIG_MKDIR=y
+# CONFIG_MKFIFO is not set
+CONFIG_MKNOD=y
+CONFIG_MV=y
+# CONFIG_OD is not set
+# CONFIG_PRINTF is not set
+CONFIG_PWD=y
+CONFIG_REALPATH=y
+CONFIG_RM=y
+CONFIG_RMDIR=y
+# CONFIG_SHA1SUM is not set
+# CONFIG_SLEEP is not set
+CONFIG_SORT=y
+# CONFIG_FEATURE_SORT_REVERSE is not set
+# CONFIG_FEATURE_SORT_UNIQUE is not set
+# CONFIG_STTY is not set
+CONFIG_SYNC=y
+CONFIG_TAIL=y
+# CONFIG_FEATURE_FANCY_TAIL is not set
+# CONFIG_TEE is not set
+CONFIG_TEST=y
+
+#
+# test (forced enabled for use with shell)
+#
+CONFIG_TOUCH=y
+CONFIG_TR=y
+CONFIG_TRUE=y
+# CONFIG_TTY is not set
+CONFIG_UNAME=y
+# CONFIG_UNIQ is not set
+# CONFIG_USLEEP is not set
+# CONFIG_UUDECODE is not set
+# CONFIG_UUENCODE is not set
+# CONFIG_WATCH is not set
+CONFIG_WC=y
+# CONFIG_WHO is not set
+# CONFIG_WHOAMI is not set
+# CONFIG_YES is not set
+
+#
+# Common options for cp and mv
+#
+CONFIG_FEATURE_PRESERVE_HARDLINKS=y
+
+#
+# Common options for ls and more
+#
+CONFIG_FEATURE_AUTOWIDTH=y
+
+#
+# Common options for df, du, ls
+#
+CONFIG_FEATURE_HUMAN_READABLE=y
+
+#
+# Console Utilities
+#
+# CONFIG_CHVT is not set
+# CONFIG_CLEAR is not set
+# CONFIG_DEALLOCVT is not set
+# CONFIG_DUMPKMAP is not set
+# CONFIG_LOADACM is not set
+# CONFIG_LOADFONT is not set
+# CONFIG_LOADKMAP is not set
+# CONFIG_OPENVT is not set
+# CONFIG_RESET is not set
+# CONFIG_SETKEYCODES is not set
+
+#
+# Debian Utilities
+#
+# CONFIG_MKTEMP is not set
+CONFIG_READLINK=y
+# CONFIG_RUN_PARTS is not set
+# CONFIG_WHICH is not set
+
+#
+# Editors
+#
+# CONFIG_AWK is not set
+CONFIG_SED=y
+# CONFIG_FEATURE_SED_EMBEDED_NEWLINE is not set
+# CONFIG_VI is not set
+
+#
+# Finding Utilities
+#
+CONFIG_FIND=y
+CONFIG_FEATURE_FIND_MTIME=y
+CONFIG_FEATURE_FIND_PERM=y
+CONFIG_FEATURE_FIND_TYPE=y
+CONFIG_FEATURE_FIND_XDEV=y
+CONFIG_FEATURE_FIND_NEWER=y
+CONFIG_FEATURE_FIND_INUM=y
+CONFIG_GREP=y
+# CONFIG_FEATURE_GREP_EGREP_ALIAS is not set
+# CONFIG_FEATURE_GREP_CONTEXT is not set
+# CONFIG_XARGS is not set
+
+#
+# Init Utilities
+#
+CONFIG_INIT=y
+CONFIG_FEATURE_USE_INITTAB=y
+CONFIG_FEATURE_INITRD=y
+# CONFIG_FEATURE_INIT_COREDUMPS is not set
+# CONFIG_FEATURE_EXTRA_QUIET is not set
+CONFIG_HALT=y
+# CONFIG_POWEROFF is not set
+CONFIG_REBOOT=y
+# CONFIG_START_STOP_DAEMON is not set
+# CONFIG_MESG is not set
+
+#
+# Login/Password Management Utilities
+#
+# CONFIG_USE_BB_PWD_GRP is not set
+# CONFIG_ADDGROUP is not set
+# CONFIG_DELGROUP is not set
+# CONFIG_ADDUSER is not set
+# CONFIG_DELUSER is not set
+# CONFIG_GETTY is not set
+# CONFIG_LOGIN is not set
+# CONFIG_PASSWD is not set
+# CONFIG_SU is not set
+# CONFIG_SULOGIN is not set
+# CONFIG_VLOCK is not set
+
+#
+# Miscellaneous Utilities
+#
+# CONFIG_ADJTIMEX is not set
+# CONFIG_CROND is not set
+# CONFIG_CRONTAB is not set
+# CONFIG_DC is not set
+# CONFIG_DUTMP is not set
+# CONFIG_MAKEDEVS is not set
+# CONFIG_MT is not set
+# CONFIG_STRINGS is not set
+# CONFIG_TIME is not set
+# CONFIG_UPDATE is not set
+# CONFIG_WATCHDOG is not set
+
+#
+# Linux Module Utilities
+#
+CONFIG_INSMOD=y
+# CONFIG_FEATURE_OLD_MODULE_INTERFACE is not set
+CONFIG_FEATURE_NEW_MODULE_INTERFACE=y
+
+#
+#   Support new (post 2.1) Linux kernels (Forced enabled)
+#
+# CONFIG_FEATURE_INSMOD_VERSION_CHECKING is not set
+# CONFIG_FEATURE_INSMOD_KSYMOOPS_SYMBOLS is not set
+# CONFIG_FEATURE_INSMOD_LOADINKMEM is not set
+# CONFIG_FEATURE_INSMOD_LOAD_MAP is not set
+CONFIG_LSMOD=y
+CONFIG_FEATURE_QUERY_MODULE_INTERFACE=y
+CONFIG_MODPROBE=y
+# CONFIG_RMMOD is not set
+CONFIG_FEATURE_CHECK_TAINTED_MODULE=y
+
+#
+# Networking Utilities
+#
+# CONFIG_FEATURE_IPV6 is not set
+# CONFIG_ARPING is not set
+# CONFIG_FTPGET is not set
+# CONFIG_FTPPUT is not set
+# CONFIG_HOSTNAME is not set
+# CONFIG_HTTPD is not set
+# CONFIG_IFCONFIG is not set
+# CONFIG_IFUPDOWN is not set
+# CONFIG_INETD is not set
+CONFIG_IP=y
+CONFIG_FEATURE_IP_ADDRESS=y
+CONFIG_FEATURE_IP_LINK=y
+CONFIG_FEATURE_IP_ROUTE=y
+# CONFIG_FEATURE_IP_TUNNEL is not set
+# CONFIG_IPCALC is not set
+# CONFIG_IPADDR is not set
+# CONFIG_IPLINK is not set
+# CONFIG_IPROUTE is not set
+# CONFIG_IPTUNNEL is not set
+# CONFIG_NAMEIF is not set
+# CONFIG_NC is not set
+# CONFIG_NETSTAT is not set
+# CONFIG_NSLOOKUP is not set
+# CONFIG_PING is not set
+# CONFIG_ROUTE is not set
+# CONFIG_TELNET is not set
+# CONFIG_TELNETD is not set
+# CONFIG_TFTP is not set
+# CONFIG_TRACEROUTE is not set
+# CONFIG_VCONFIG is not set
+CONFIG_WGET=y
+# CONFIG_FEATURE_WGET_STATUSBAR is not set
+CONFIG_FEATURE_WGET_AUTHENTICATION=y
+
+#
+# udhcp Server/Client
+#
+# CONFIG_UDHCPD is not set
+CONFIG_UDHCPC=y
+CONFIG_FEATURE_UDHCP_SYSLOG=y
+# CONFIG_FEATURE_UDHCP_DEBUG is not set
+
+#
+# Process Utilities
+#
+CONFIG_FREE=y
+CONFIG_KILL=y
+# CONFIG_KILLALL is not set
+CONFIG_PIDOF=y
+CONFIG_PS=y
+# CONFIG_RENICE is not set
+# CONFIG_TOP is not set
+# CONFIG_UPTIME is not set
+
+#
+# Another Bourne-like Shell
+#
+CONFIG_FEATURE_SH_IS_ASH=y
+# CONFIG_FEATURE_SH_IS_HUSH is not set
+# CONFIG_FEATURE_SH_IS_LASH is not set
+# CONFIG_FEATURE_SH_IS_MSH is not set
+# CONFIG_FEATURE_SH_IS_NONE is not set
+CONFIG_ASH=y
+
+#
+# ash (forced enabled as default shell)
+#
+
+#
+# Ash Shell Options
+#
+# CONFIG_ASH_JOB_CONTROL is not set
+# CONFIG_ASH_ALIAS is not set
+CONFIG_ASH_MATH_SUPPORT=y
+# CONFIG_ASH_GETOPTS is not set
+# CONFIG_ASH_CMDCMD is not set
+# CONFIG_ASH_MAIL is not set
+CONFIG_ASH_OPTIMIZE_FOR_SIZE=y
+# CONFIG_HUSH is not set
+# CONFIG_LASH is not set
+# CONFIG_MSH is not set
+
+#
+# Bourne Shell Options
+#
+CONFIG_FEATURE_COMMAND_EDITING=y
+# CONFIG_FEATURE_COMMAND_SAVEHISTORY is not set
+CONFIG_FEATURE_COMMAND_TAB_COMPLETION=y
+# CONFIG_FEATURE_COMMAND_USERNAME_COMPLETION is not set
+CONFIG_FEATURE_COMMAND_HISTORY=15
+CONFIG_FEATURE_SH_STANDALONE_SHELL=y
+# CONFIG_FEATURE_SH_APPLETS_ALWAYS_WIN is not set
+CONFIG_FEATURE_SH_FANCY_PROMPT=y
+# CONFIG_FEATURE_SH_EXTRA_QUIET is not set
+
+#
+# System Logging Utilities
+#
+CONFIG_SYSLOGD=y
+# CONFIG_FEATURE_REMOTE_LOG is not set
+# CONFIG_FEATURE_IPC_SYSLOG is not set
+CONFIG_KLOGD=y
+CONFIG_LOGGER=y
+
+#
+# Linux System Utilities
+#
+CONFIG_DMESG=y
+# CONFIG_FBSET is not set
+# CONFIG_FDFLUSH is not set
+# CONFIG_FDISK is not set
+# CONFIG_FREERAMDISK is not set
+# CONFIG_FSCK_MINIX is not set
+# CONFIG_MKFS_MINIX is not set
+# CONFIG_GETOPT is not set
+# CONFIG_HEXDUMP is not set
+# CONFIG_HWCLOCK is not set
+# CONFIG_LOSETUP is not set
+CONFIG_MKSWAP=y
+CONFIG_MORE=y
+CONFIG_FEATURE_USE_TERMIOS=y
+
+#
+# Common options for ls and more
+#
+CONFIG_PIVOT_ROOT=y
+# CONFIG_RDATE is not set
+CONFIG_SWAPONOFF=y
+CONFIG_MOUNT=y
+# CONFIG_NFSMOUNT is not set
+CONFIG_UMOUNT=y
+CONFIG_FEATURE_MOUNT_FORCE=y
+
+#
+# Common options for mount/umount
+#
+# CONFIG_FEATURE_MOUNT_LOOP is not set
+# CONFIG_FEATURE_MTAB_SUPPORT is not set
+
+#
+# Debugging Options
+#
+# DODEBUG is not set
diff --git a/debian/control b/debian/control
index ae1aee551..c0a500cc4 100644
--- a/debian/control
+++ b/debian/control
@@ -66,3 +66,22 @@ Description: Tiny utilities for the debian-installer
  on the debian-installer, this package is not for you.  Installing this 
  on your Debian system is a very, very bad idea.  You have been warned.
 
+Package: busybox-cvs-net-udeb
+Architecture: i386
+Depends: ${shlibs:Depends}
+Section: debian-installer
+Conflicts: busybox-udeb
+Priority: extra
+Description: Tiny utilities for the debian-installer network images
+ BusyBox combines tiny versions of many common UNIX utilities into a single
+ small executable. It provides minimalist replacements for the most common
+ utilities you would usually find on your desktop system (i.e., ls, cp, mv,
+ mount, tar, etc.).  The utilities in BusyBox generally have fewer options than
+ their full-featured GNU cousins; however, the options that are included
+ provide the expected functionality and behave very much like their GNU
+ counterparts.
+ .
+ busybox-udeb is used by the debian-installer, so unless you are working
+ on the debian-installer, this package is not for you.  Installing this 
+ on your Debian system is a very, very bad idea.  You have been warned.
+
diff --git a/debian/rules b/debian/rules
index a1fe24543..47605fa71 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,8 +6,9 @@
 # This is the debhelper compatibility version to use.
 export DH_COMPAT=3
 
+DEB_HOST_ARCH ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
+
 VERSION = $(shell dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2)
-ARCH = $(shell dpkg --print-architecture)
 
 ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS)))
         DODEBUG = true
@@ -15,38 +16,103 @@ endif
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 endif
 
-build-arch: build-arch-stamp
-build-arch-stamp:
+PACKAGE_PREFIX = busybox-cvs
+
+PACKAGES_DEB = $(PACKAGE_PREFIX) $(PACKAGE_PREFIX)-static
+PACKAGES_UDEB = $(PACKAGE_PREFIX)-udeb
+ifneq ($(wildcard ./debian/config-net-udeb-$(DEB_HOST_ARCH)),)
+PACKAGES_UDEB += $(PACKAGE_PREFIX)-net-udeb
+endif
+PACKAGES = $(PACKAGES_DEB) $(PACKAGES_UDEB)
+DEBHELPER_PACKAGES_DEB = $(patsubst %,-p%,$(PACKAGES_DEB))
+
+build-arch: build-arch-deb build-arch-static build-arch-udeb build-arch-net-udeb build-arch-doc
+
+build-arch-deb: build-arch-deb-stamp
+build-arch-deb-stamp:
         $(MAKE) clean
+
+ifeq ($(wildcard ./debian/config-deb-$(DEB_HOST_ARCH)),)
         cp ./debian/config-deb .config
+else
+        cp ./debian/config-deb-$(DEB_HOST_ARCH) .config
+endif
+
         $(MAKE) dep
         $(MAKE) DODEBUG=$(DODEBUG)
-        install busybox busybox-deb
 
+        install -d install-$(PACKAGE_PREFIX)/bin
+        install busybox install-$(PACKAGE_PREFIX)/bin/busybox
+
+        touch $@
+
+build-arch-static: build-arch-static-stamp
+build-arch-static-stamp:
         $(MAKE) clean
+
+ifeq ($(wildcard ./debian/config-static-$(DEB_HOST_ARCH)),)
         cp ./debian/config-static .config
+else
+        cp ./debian/config-static-$(DEB_HOST_ARCH) .config
+endif
+
         $(MAKE) dep
         $(MAKE) DODEBUG=$(DODEBUG)
-        install busybox busybox-static
 
+        install -d install-$(PACKAGE_PREFIX)-static/bin
+        install busybox install-$(PACKAGE_PREFIX)-static/bin/busybox
+
+        touch $@
+
+build-arch-udeb: build-arch-udeb-stamp
+build-arch-udeb-stamp:
         $(MAKE) clean
+
+ifeq ($(wildcard ./debian/config-udeb-$(DEB_HOST_ARCH)),)
         cp ./debian/config-udeb .config
+else
+        cp ./debian/config-udeb-$(DEB_HOST_ARCH) .config
+endif
+
+        $(MAKE) dep
+        $(MAKE) DODEBUG=$(DODEBUG)
+
+        $(MAKE) PREFIX=$(CURDIR)/install-$(PACKAGE_PREFIX)-udeb install
+
+        touch $@
+
+build-arch-net-udeb: build-arch-net-udeb-stamp
+build-arch-net-udeb-stamp:
+ifneq ($(wildcard ./debian/config-net-udeb-$(DEB_HOST_ARCH)),)
+        $(MAKE) clean
+
+        cp ./debian/config-net-udeb-$(DEB_HOST_ARCH) .config
+
         $(MAKE) dep
         $(MAKE) DODEBUG=$(DODEBUG)
 
+        $(MAKE) PREFIX=$(CURDIR)/install-$(PACKAGE_PREFIX)-net-udeb install
+endif
+
+        touch $@
+
+build-arch-doc: build-arch-doc-stamp
+build-arch-doc-stamp:
         $(MAKE) docs/BusyBox.1
 
-        touch build-arch-stamp
+        cp docs/BusyBox.1 busybox.1
+
+        touch $@
 
 build: build-arch
 
 clean:
         dh_testdir
         dh_testroot
-        rm -f build-arch-stamp build-indep-stamp debian/files~
+        rm -f build-*-stamp debian/files~
 
         $(MAKE) distclean
-        -rm -f busybox-deb busybox-static busybox.1
+        -rm -rf busybox-deb busybox-static install* busybox.1
 
         dh_clean
 
@@ -56,20 +122,23 @@ install: build-arch
         dh_clean -k
         dh_installdirs
 
-        install busybox-deb $(CURDIR)/debian/busybox-cvs/bin/busybox
-        install busybox-static $(CURDIR)/debian/busybox-cvs-static/bin/busybox
-        $(MAKE) PREFIX=$(CURDIR)/debian/busybox-cvs-udeb install
-        cp docs/BusyBox.1 busybox.1
+        for i in $(PACKAGES); do \
+        ( \
+                cd install-$$i; \
+                find -type d -exec install -d $(CURDIR)/debian/$$i/{} \;; \
+                find \( -type f -o -type l \) -exec cp -a {} $(CURDIR)/debian/$$i/{} \;; \
+        ); \
+        done
 
-        install -m644 debian/busybox-cvs-static.override \
-                debian/busybox-cvs-static/usr/share/lintian/overrides/busybox-cvs-static
+        install -m644 debian/$(PACKAGE_PREFIX)-static.override \
+                debian/$(PACKAGE_PREFIX)-static/usr/share/lintian/overrides/$(PACKAGE_PREFIX)-static
 
 # Build architecture-dependent files here.
 binary-arch: build-arch install
         dh_testdir -a
         dh_testroot -a
 #       dh_installdebconf -a
-        dh_installdocs -a -Nbusybox-cvs-udeb
+        dh_installdocs $(DEBHELPER_PACKAGES_DEB)
 #       dh_installexamples -a
 #       dh_installmenu -a
 #       dh_installlogrotate -a
@@ -78,10 +147,10 @@ binary-arch: build-arch install
 #       dh_installmime -a
 #       dh_installinit -a
 #       dh_installcron -a
-        dh_installman -a -Nbusybox-cvs-udeb
+        dh_installman $(DEBHELPER_PACKAGES_DEB)
 #       dh_installinfo -a
 #       dh_undocumented -a
-        dh_installchangelogs Changelog -a -Nbusybox-cvs-udeb
+        dh_installchangelogs Changelog $(DEBHELPER_PACKAGES_DEB)
         dh_strip -a
         dh_link -a
         dh_compress -a
@@ -90,13 +159,15 @@ binary-arch: build-arch install
         dh_installdeb -a
 #       dh_perl -a
         dh_shlibdeps -a
-        dh_gencontrol -a -Nbusybox-cvs-udeb
-        dh_md5sums -a -Nbusybox-cvs-udeb
-        dh_builddeb -a -Nbusybox-cvs-udeb
-
-        dh_gencontrol -pbusybox-cvs-udeb -- -fdebian/files~
-        dpkg-distaddfile busybox-cvs-udeb_$(VERSION)_$(ARCH).udeb debian-installer extra
-        dh_builddeb -pbusybox-cvs-udeb --filename=busybox-cvs-udeb_$(VERSION)_$(ARCH).udeb
+        dh_gencontrol $(DEBHELPER_PACKAGES_DEB)
+        dh_md5sums $(DEBHELPER_PACKAGES_DEB)
+        dh_builddeb $(DEBHELPER_PACKAGES_DEB)
+
+        $(foreach PACKAGE, $(PACKAGES_UDEB), \
+        dh_gencontrol -p$(PACKAGE) -- -fdebian/files~; \
+        dpkg-distaddfile $(PACKAGE)_$(VERSION)_$(DEB_HOST_ARCH).udeb debian-installer extra; \
+        dh_builddeb -p$(PACKAGE) --filename=$(PACKAGE)_$(VERSION)_$(DEB_HOST_ARCH).udeb; \
+        )
 
 binary: binary-arch
 .PHONY: build clean binary-indep binary-arch binary install