- Updated to the latest pseudo root release (rel9) (bz 538609).

- mount.nfs: Retry v4 mounts with v3 on ENOENT errors
This commit is contained in:
Steve Dickson 2009-12-07 22:45:32 +00:00
parent c2754f092e
commit 500795b2bb
2 changed files with 34 additions and 1 deletions

View File

@ -0,0 +1,30 @@
commit 26a14b65991b79d317638f78dc6b4e5ac1ef712e
Author: Neil Brown <neilb@suse.de>
Date: Mon Dec 7 17:23:48 2009 -0500
mount.nfs: Retry v4 mounts with v3 on ENOENT errors
Retry v4 mounts with a v3 mount when the version
is not explicitly specified and the mount fails
with ENOENT. The will help deal with Linux servers
that do not automatically export a pseudo root
Signed-off-by: Steve Dickson <steved@redhat.com>
diff --git a/utils/mount/stropts.c b/utils/mount/stropts.c
index a0b9e7f..4007150 100644
--- a/utils/mount/stropts.c
+++ b/utils/mount/stropts.c
@@ -668,9 +668,10 @@ static int nfs_try_mount(struct nfsmount_info *mi)
/*
* To deal with legacy Linux servers that don't
* automatically export a pseudo root, retry
- * ENOENT errors using version 3
+ * ENOENT errors using version 3. And for
+ * Linux servers prior to 2.6.25, retry EPERM
*/
- if (errno != ENOENT)
+ if (errno != ENOENT && errno != EPERM)
break;
}
}

View File

@ -24,6 +24,7 @@ Patch02: nfs-utils-1.1.0-exp-subtree-warn-off.patch
Patch200: nfs-utils-1.2.0-v4root-rel9.patch
Patch201: nfs-utils-1.2.1-nfsd-bootfail.patch
Patch202: nfs-utils-1.2.1-mount-eperm.patch
Group: System Environment/Daemons
Provides: exportfs = %{epoch}:%{version}-%{release}
@ -77,6 +78,7 @@ This package also contains the mount.nfs and umount.nfs program.
%patch200 -p1
%patch201 -p1
%patch202 -p1
# Remove .orig files
find . -name "*.orig" | xargs rm -f
@ -249,7 +251,8 @@ fi
%changelog
* Mon Dec 7 2009 Steve Dickson <steved@redhat.com> 1.2.1-4
- Updated to the latest pseudo root release (rel9).
- Updated to the latest pseudo root release (rel9) (bz 538609).
- mount.nfs: Retry v4 mounts with v3 on ENOENT errors
* Thu Nov 12 2009 Steve Dickson <steved@redhat.com> 1.2.1-3
- Stop rpc.nfsd from failing to startup when the network