Rename CONFIG_NFSMOUNT to CONFIG_FEATURE_MOUNT_NFS so allbaseconfig can

find it (and tweak defconfig to catch up).

diff --git a/sysdeps/linux/defconfig b/sysdeps/linux/defconfig
index 617e86ba726713d0350e2dea58da4a9c345209e3..51582d1ae067c969fd17c3616b55d14f3afe148a 100644 (file)
--- a/sysdeps/linux/defconfig
+++ b/sysdeps/linux/defconfig
@@ -121,6 +121,7 @@ CONFIG_RMDIR=y
 CONFIG_SLEEP=y
 # CONFIG_FEATURE_FANCY_SLEEP is not set
 CONFIG_SORT=y
+CONFIG_FEATURE_SORT_BIG=y
 # CONFIG_STTY is not set
 CONFIG_SYNC=y
 CONFIG_TAIL=y
@@ -407,7 +408,7 @@ CONFIG_PIVOT_ROOT=y
 # CONFIG_RDATE is not set
 CONFIG_SWAPONOFF=y
 CONFIG_MOUNT=y
-# CONFIG_NFSMOUNT is not set
+# CONFIG_FEATURE_MOUNT_NFS is not set
 CONFIG_UMOUNT=y
 
 #

diff --git a/util-linux/Config.in b/util-linux/Config.in
index 01da99c41981cbc33b873d4049ee1c173d59851a..dc6d8fdad29b83dfd54d5b58307503f2faae8a36 100644 (file)
--- a/util-linux/Config.in
+++ b/util-linux/Config.in
@@ -325,7 +325,7 @@ config CONFIG_MOUNT
          NFS filesystems.  Most people using BusyBox will also want to enable
          the 'mount' utility.
 
-config CONFIG_NFSMOUNT
+config CONFIG_FEATURE_MOUNT_NFS
        bool "  Support mounting NFS file systems"
        default n
        depends on CONFIG_MOUNT

diff --git a/util-linux/Makefile.in b/util-linux/Makefile.in
index 6bd10afd99af37f11845e6af9d1782a2a703aeba..3dd41bb1575e30231e27d48b6858e7b76a2a3549 100644 (file)
--- a/util-linux/Makefile.in
+++ b/util-linux/Makefile.in
@@ -28,7 +28,7 @@ UTILLINUX-$(CONFIG_MKFS_MINIX)    +=mkfs_minix.o
 UTILLINUX-$(CONFIG_MKSWAP)        +=mkswap.o
 UTILLINUX-$(CONFIG_MORE)          +=more.o
 UTILLINUX-$(CONFIG_MOUNT)         +=mount.o
-UTILLINUX-$(CONFIG_NFSMOUNT)      +=nfsmount.o
+UTILLINUX-$(CONFIG_FEATURE_MOUNT_NFS)  +=nfsmount.o
 UTILLINUX-$(CONFIG_PIVOT_ROOT)    +=pivot_root.o
 UTILLINUX-$(CONFIG_RDATE)         +=rdate.o
 UTILLINUX-$(CONFIG_READPROFILE)   +=readprofile.o

diff --git a/util-linux/mount.c b/util-linux/mount.c
index 05f25a70d2e0e4aa110575cac77462d3631439a3..15b2b192fda467458796e7e348a1b1c9a6d413b5 100644 (file)
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -37,7 +37,7 @@
 
 /* This is just a warning of a common mistake.  Possibly this should be a
  * uclibc faq entry rather than in busybox... */
-#if ENABLE_NFSMOUNT && defined(__UCLIBC__) && ! defined(__UCLIBC_HAS_RPC__)
+#if ENABLE_FEATURE_MOUNT_NFS && defined(__UCLIBC__) && ! defined(__UCLIBC_HAS_RPC__)
 #error "You need to build uClibc with UCLIBC_HAS_RPC for busybox mount with NFS support to compile."
 #endif
 
@@ -278,7 +278,7 @@ singlemount:
 
                // Might this be an NFS filesystem?
 
-               if(ENABLE_NFSMOUNT && (!fsType || !strcmp(fsType,"nfs")) &&
+               if(ENABLE_FEATURE_MOUNT_NFS && (!fsType || !strcmp(fsType,"nfs")) &&
                        strchr(blockDevice, ':') != NULL)
                {
                        if(nfsmount(blockDevice, directory, &flags, &string_flags, 1))