summaryrefslogtreecommitdiff
path: root/util-linux
diff options
context:
space:
mode:
authorMark Whitley2001-02-01 19:51:13 +0000
committerMark Whitley2001-02-01 19:51:13 +0000
commit065c7e779a0ab49267ef18f2f851d9886719151c (patch)
tree0f5b80cd6ec437642023bcae1ae321cb7e98b7f5 /util-linux
parent9b300d0b1f73ae796ec1f27e9efed947ff56a9af (diff)
downloadbusybox-065c7e779a0ab49267ef18f2f851d9886719151c.zip
busybox-065c7e779a0ab49267ef18f2f851d9886719151c.tar.gz
Applied patch from Chris Jaeger <cjaeger@ensim.com> to do better checking for
NFS_MOUNT_VERSION, depending on which kernel you're running.
Diffstat (limited to 'util-linux')
-rw-r--r--util-linux/nfsmount.c19
1 files changed, 11 insertions, 8 deletions
diff --git a/util-linux/nfsmount.c b/util-linux/nfsmount.c
index 397858b..e615d1d 100644
--- a/util-linux/nfsmount.c
+++ b/util-linux/nfsmount.c
@@ -183,7 +183,8 @@ static int nfs_mount_version;
* nfs_mount_version: version this source and running kernel can handle
*/
static void
-find_kernel_nfs_mount_version(void) {
+find_kernel_nfs_mount_version(void)
+{
static int kernel_version = 0;
if (kernel_version)
@@ -193,15 +194,17 @@ find_kernel_nfs_mount_version(void) {
kernel_version = get_kernel_revision();
if (kernel_version) {
- if (kernel_version < MAKE_VERSION(2,1,32))
- nfs_mount_version = 1;
- else if (kernel_version < MAKE_VERSION(2,3,99))
- nfs_mount_version = 3;
- else
- nfs_mount_version = 4; /* since 2.3.99pre4 */
+ if (kernel_version < MAKE_VERSION(2,1,32))
+ nfs_mount_version = 1;
+ else if (kernel_version < MAKE_VERSION(2,2,18) ||
+ (kernel_version >= MAKE_VERSION(2,3,0) &&
+ kernel_version < MAKE_VERSION(2,3,99)))
+ nfs_mount_version = 3;
+ else
+ nfs_mount_version = 4; /* since 2.3.99pre4 */
}
if (nfs_mount_version > NFS_MOUNT_VERSION)
- nfs_mount_version = NFS_MOUNT_VERSION;
+ nfs_mount_version = NFS_MOUNT_VERSION;
}
static struct pmap *