forked from pool/util-linux
32 lines
782 B
Diff
32 lines
782 B
Diff
|
--- util-linux-2.12r/mount/mount.c
|
||
|
|
+++ util-linux-2.12r/mount/mount.c
|
||
|
|
@@ -927,17 +927,6 @@
|
||
|
|
|
||
|
|
block_signals (SIG_UNBLOCK);
|
||
|
|
|
||
|
|
-#ifdef HAVE_NFS
|
||
|
|
- if (mnt_err && types && streq (types, "nfs")) {
|
||
|
|
- if (nfs_mount_version == 4 && mnt_err != EBUSY && mnt_err != ENOENT) {
|
||
|
|
- if (verbose)
|
||
|
|
- printf(_("mount: failed with nfs mount version 4, trying 3..\n"));
|
||
|
|
- nfs_mount_version = 3;
|
||
|
|
- goto retry_nfs;
|
||
|
|
- }
|
||
|
|
- }
|
||
|
|
-#endif
|
||
|
|
-
|
||
|
|
/* Mount failed, complain, but don't die. */
|
||
|
|
|
||
|
|
if (types == 0) {
|
||
|
|
--- util-linux-2.12r/mount/nfsmount.c
|
||
|
|
+++ util-linux-2.12r/mount/nfsmount.c
|
||
|
|
@@ -76,7 +76,7 @@
|
||
|
|
|
||
|
|
#define MAKE_VERSION(p,q,r) (65536*(p) + 256*(q) + (r))
|
||
|
|
|
||
|
|
-#define MAX_NFSPROT ((nfs_mount_version >= 4) ? 3 : 2)
|
||
|
|
+#define MAX_NFSPROT 3
|
||
|
|
|
||
|
|
static int
|
||
|
|
linux_version_code(void) {
|