busybox: change slugos defconfig not to include mount/umount/swaponoff in 1.01

 - the util-linux versions of the standard mount utilities are now used
   in the slugos images.

2 files changed, 25 insertions, 48 deletions

diff --git a/packages/busybox/busybox-1.01/slugos/defconfig b/packages/busybox/busybox-1.01/slugos/defconfig
index 7debaeced2..51bfa5b3e8 100644
--- a/packages/busybox/busybox-1.01/slugos/defconfig
+++ b/packages/busybox/busybox-1.01/slugos/defconfig
@@ -12,10 +12,11 @@ CONFIG_FEATURE_BUFFERS_GO_ON_STACK=y
 CONFIG_FEATURE_VERBOSE_USAGE=y
 # CONFIG_FEATURE_INSTALLER is not set
 # CONFIG_LOCALE_SUPPORT is not set
-CONFIG_FEATURE_DEVFS=y
+# CONFIG_FEATURE_DEVFS is not set
 CONFIG_FEATURE_DEVPTS=y
 # CONFIG_FEATURE_CLEAN_UP is not set
-# CONFIG_FEATURE_SUID is not set
+CONFIG_FEATURE_SUID=y
+# CONFIG_FEATURE_SUID_CONFIG is not set
 # CONFIG_SELINUX is not set
 
 #
@@ -95,7 +96,7 @@ CONFIG_EXPR=y
 CONFIG_FALSE=y
 # CONFIG_FOLD is not set
 CONFIG_HEAD=y
-# CONFIG_FEATURE_FANCY_HEAD is not set
+CONFIG_FEATURE_FANCY_HEAD=y
 # CONFIG_HOSTID is not set
 CONFIG_ID=y
 # CONFIG_INSTALL is not set
@@ -176,14 +177,14 @@ CONFIG_FEATURE_HUMAN_READABLE=y
 #
 # Console Utilities
 #
-CONFIG_CHVT=y
+# CONFIG_CHVT is not set
 CONFIG_CLEAR=y
-CONFIG_DEALLOCVT=y
-CONFIG_DUMPKMAP=y
+# CONFIG_DEALLOCVT is not set
+# CONFIG_DUMPKMAP is not set
 CONFIG_GETKEY=y
-CONFIG_LOADFONT=y
-CONFIG_LOADKMAP=y
-CONFIG_OPENVT=y
+# CONFIG_LOADFONT is not set
+# CONFIG_LOADKMAP is not set
+# CONFIG_OPENVT is not set
 CONFIG_RESET=y
 # CONFIG_SETKEYCODES is not set
 
@@ -210,10 +211,10 @@ 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 is not set
-# CONFIG_FEATURE_VI_READONLY is not set
-# CONFIG_FEATURE_VI_SETOPTS is not set
-# CONFIG_FEATURE_VI_SET is not set
+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
 
@@ -245,7 +246,7 @@ CONFIG_FEATURE_GREP_CONTEXT=y
 # CONFIG_ADDUSER is not set
 # CONFIG_DELUSER is not set
 # CONFIG_GETTY is not set
-CONFIG_FEATURE_U_W_TMP=y
+CONFIG_FEATURE_UTMP=y
 # CONFIG_LOGIN is not set
 # CONFIG_PASSWD is not set
 # CONFIG_SU is not set
@@ -258,7 +259,7 @@ CONFIG_FEATURE_U_W_TMP=y
 # CONFIG_ADJTIMEX is not set
 # CONFIG_CROND is not set
 # CONFIG_CRONTAB is not set
-CONFIG_DC=y
+# CONFIG_DC is not set
 # CONFIG_DEVFSD is not set
 # CONFIG_LAST is not set
 # CONFIG_HDPARM is not set
@@ -300,11 +301,7 @@ CONFIG_FEATURE_IFUPDOWN_IPV6=y
 # CONFIG_FEATURE_IFUPDOWN_IPX is not set
 # CONFIG_FEATURE_IFUPDOWN_MAPPING 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=y
+# CONFIG_IP is not set
 # CONFIG_IPCALC is not set
 # CONFIG_IPADDR is not set
 # CONFIG_IPLINK is not set
@@ -320,7 +317,7 @@ CONFIG_PING6=y
 CONFIG_FEATURE_FANCY_PING6=y
 CONFIG_ROUTE=y
 CONFIG_TELNET=y
-# CONFIG_FEATURE_TELNET_TTYPE is not set
+CONFIG_FEATURE_TELNET_TTYPE=y
 CONFIG_FEATURE_TELNET_AUTOLOGIN=y
 # CONFIG_TELNETD is not set
 CONFIG_TFTP=y
@@ -372,10 +369,6 @@ CONFIG_ASH=y
 # Ash Shell Options
 #
 CONFIG_ASH_JOB_CONTROL=y
-CONFIG_ASH_PIPE_OPTIMIZATION=y
-CONFIG_FEATURE_BUILTIN_TEST=y
-CONFIG_FEATURE_BUILTIN_ECHO=y
-CONFIG_FEATURE_BUILTIN_PIDOF=y
 CONFIG_ASH_ALIAS=y
 CONFIG_ASH_MATH_SUPPORT=y
 # CONFIG_ASH_MATH_SUPPORT_64 is not set
@@ -417,19 +410,11 @@ CONFIG_LOGGER=y
 # Linux System Utilities
 #
 CONFIG_DMESG=y
-CONFIG_FBSET=y
-CONFIG_FEATURE_FBSET_FANCY=y
-# CONFIG_FEATURE_FBSET_READMODE is not set
+# CONFIG_FBSET is not set
 # CONFIG_FDFLUSH is not set
 # CONFIG_FDFORMAT is not set
-CONFIG_FDISK=y
+# CONFIG_FDISK is not set
 FDISK_SUPPORT_LARGE_DISKS=y
-CONFIG_FEATURE_FDISK_WRITABLE=y
-# CONFIG_FEATURE_AIX_LABEL is not set
-# CONFIG_FEATURE_SGI_LABEL is not set
-# CONFIG_FEATURE_SUN_LABEL is not set
-# CONFIG_FEATURE_OSF_LABEL is not set
-# CONFIG_FEATURE_FDISK_ADVANCED is not set
 # CONFIG_FREERAMDISK is not set
 # CONFIG_FSCK_MINIX is not set
 # CONFIG_MKFS_MINIX is not set
@@ -437,23 +422,15 @@ CONFIG_FEATURE_FDISK_WRITABLE=y
 CONFIG_HEXDUMP=y
 CONFIG_HWCLOCK=y
 CONFIG_FEATURE_HWCLOCK_LONGOPTIONS=y
-CONFIG_LOSETUP=y
+# CONFIG_LOSETUP is not set
 CONFIG_MKSWAP=y
 CONFIG_MORE=y
 CONFIG_FEATURE_USE_TERMIOS=y
 CONFIG_PIVOT_ROOT=y
 # CONFIG_RDATE is not set
-CONFIG_SWAPONOFF=y
-CONFIG_MOUNT=y
-CONFIG_NFSMOUNT=y
-CONFIG_UMOUNT=y
-CONFIG_FEATURE_MOUNT_FORCE=y
-
-#
-# Common options for mount/umount
-#
-CONFIG_FEATURE_MOUNT_LOOP=y
-# CONFIG_FEATURE_MTAB_SUPPORT is not set
+# CONFIG_SWAPONOFF is not set
+# CONFIG_MOUNT is not set
+# CONFIG_UMOUNT is not set
 
 #
 # Debugging Options
diff --git a/packages/busybox/busybox_1.01.bb b/packages/busybox/busybox_1.01.bb
index 49af0e3513..37c691e746 100644
--- a/packages/busybox/busybox_1.01.bb
+++ b/packages/busybox/busybox_1.01.bb
@@ -10,7 +10,7 @@ HOMEPAGE = "http://www.busybox.net"
 LICENSE = "GPL"
 SECTION = "base"
 PRIORITY = "required"
-PR = "r2"
+PR = "r3"
 
 SRC_URI = "http://www.busybox.net/downloads/busybox-${PV}.tar.gz \
 	   file://udhcppidfile.patch;patch=1 \