emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Rename CONFIG_NFSMOUNT to CONFIG_FEATURE_MOUNT_NFS so allbaseconfig can

Browse Source 
find it (and tweak defconfig to catch up).
This commit is contained in:
Rob Landley 2005-10-08 18:49:45 +00:00
parent 45ad0e87d6
commit 4a7252babd
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
sysdeps/linux/defconfig
View File

@ -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
#

2
util-linux/Config.in
View File

@ -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

2
util-linux/Makefile.in
View File

@ -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

4
util-linux/mount.c
View File

@ -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))