aboutsummaryrefslogtreecommitdiff
path: root/util-linux
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2005-10-08 18:49:45 +0000
committerRob Landley <rob@landley.net>2005-10-08 18:49:45 +0000
commit4a7252babdeca935e8446b136f98bae6b6e2f04a (patch)
treecda1148d99465a80bc7ef5f4256c31c34b43bea6 /util-linux
parent45ad0e87d679fd7fe09909577e539dfe95646e54 (diff)
downloadbusybox-w32-4a7252babdeca935e8446b136f98bae6b6e2f04a.tar.gz
busybox-w32-4a7252babdeca935e8446b136f98bae6b6e2f04a.tar.bz2
busybox-w32-4a7252babdeca935e8446b136f98bae6b6e2f04a.zip
Rename CONFIG_NFSMOUNT to CONFIG_FEATURE_MOUNT_NFS so allbaseconfig can
find it (and tweak defconfig to catch up).
Diffstat (limited to 'util-linux')
-rw-r--r--util-linux/Config.in2
-rw-r--r--util-linux/Makefile.in2
-rw-r--r--util-linux/mount.c4
3 files changed, 4 insertions, 4 deletions
diff --git a/util-linux/Config.in b/util-linux/Config.in
index 01da99c41..dc6d8fdad 100644
--- a/util-linux/Config.in
+++ b/util-linux/Config.in
@@ -325,7 +325,7 @@ config CONFIG_MOUNT
325 NFS filesystems. Most people using BusyBox will also want to enable 325 NFS filesystems. Most people using BusyBox will also want to enable
326 the 'mount' utility. 326 the 'mount' utility.
327 327
328config CONFIG_NFSMOUNT 328config CONFIG_FEATURE_MOUNT_NFS
329 bool " Support mounting NFS file systems" 329 bool " Support mounting NFS file systems"
330 default n 330 default n
331 depends on CONFIG_MOUNT 331 depends on CONFIG_MOUNT
diff --git a/util-linux/Makefile.in b/util-linux/Makefile.in
index 6bd10afd9..3dd41bb15 100644
--- a/util-linux/Makefile.in
+++ b/util-linux/Makefile.in
@@ -28,7 +28,7 @@ UTILLINUX-$(CONFIG_MKFS_MINIX) +=mkfs_minix.o
28UTILLINUX-$(CONFIG_MKSWAP) +=mkswap.o 28UTILLINUX-$(CONFIG_MKSWAP) +=mkswap.o
29UTILLINUX-$(CONFIG_MORE) +=more.o 29UTILLINUX-$(CONFIG_MORE) +=more.o
30UTILLINUX-$(CONFIG_MOUNT) +=mount.o 30UTILLINUX-$(CONFIG_MOUNT) +=mount.o
31UTILLINUX-$(CONFIG_NFSMOUNT) +=nfsmount.o 31UTILLINUX-$(CONFIG_FEATURE_MOUNT_NFS) +=nfsmount.o
32UTILLINUX-$(CONFIG_PIVOT_ROOT) +=pivot_root.o 32UTILLINUX-$(CONFIG_PIVOT_ROOT) +=pivot_root.o
33UTILLINUX-$(CONFIG_RDATE) +=rdate.o 33UTILLINUX-$(CONFIG_RDATE) +=rdate.o
34UTILLINUX-$(CONFIG_READPROFILE) +=readprofile.o 34UTILLINUX-$(CONFIG_READPROFILE) +=readprofile.o
diff --git a/util-linux/mount.c b/util-linux/mount.c
index 05f25a70d..15b2b192f 100644
--- a/util-linux/mount.c
+++ b/util-linux/mount.c
@@ -37,7 +37,7 @@
37 37
38/* This is just a warning of a common mistake. Possibly this should be a 38/* This is just a warning of a common mistake. Possibly this should be a
39 * uclibc faq entry rather than in busybox... */ 39 * uclibc faq entry rather than in busybox... */
40#if ENABLE_NFSMOUNT && defined(__UCLIBC__) && ! defined(__UCLIBC_HAS_RPC__) 40#if ENABLE_FEATURE_MOUNT_NFS && defined(__UCLIBC__) && ! defined(__UCLIBC_HAS_RPC__)
41#error "You need to build uClibc with UCLIBC_HAS_RPC for busybox mount with NFS support to compile." 41#error "You need to build uClibc with UCLIBC_HAS_RPC for busybox mount with NFS support to compile."
42#endif 42#endif
43 43
@@ -278,7 +278,7 @@ singlemount:
278 278
279 // Might this be an NFS filesystem? 279 // Might this be an NFS filesystem?
280 280
281 if(ENABLE_NFSMOUNT && (!fsType || !strcmp(fsType,"nfs")) && 281 if(ENABLE_FEATURE_MOUNT_NFS && (!fsType || !strcmp(fsType,"nfs")) &&
282 strchr(blockDevice, ':') != NULL) 282 strchr(blockDevice, ':') != NULL)
283 { 283 {
284 if(nfsmount(blockDevice, directory, &flags, &string_flags, 1)) 284 if(nfsmount(blockDevice, directory, &flags, &string_flags, 1))