From a38af1c1d64b89a0988a919ec3782b574b5c7719 Mon Sep 17 00:00:00 2001
From: kzak <kzak@fedoraproject.org>
Date: Thu, 1 Mar 2007 22:34:44 +0000
Subject: [PATCH] - Fixed mount.nfs -f (fake) option (bz 227988)

---
 nfs-utils-1.0.10-mount-fake.patch | 35 +++++++++++++++++++++++++++++++
 nfs-utils.spec                    |  7 ++++++-
 2 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100644 nfs-utils-1.0.10-mount-fake.patch

diff --git a/nfs-utils-1.0.10-mount-fake.patch b/nfs-utils-1.0.10-mount-fake.patch
new file mode 100644
index 0000000..e1bcd0d
--- /dev/null
+++ b/nfs-utils-1.0.10-mount-fake.patch
@@ -0,0 +1,35 @@
+
+Signed-off-by: Karel Zak <kzak@redhat.com>
+
+--- nfs-utils-1.0.10/utils/mount/mount.c.kzak	2007-02-09 12:26:16.000000000 +0100
++++ nfs-utils-1.0.10/utils/mount/mount.c	2007-02-09 12:27:59.000000000 +0100
+@@ -494,20 +494,21 @@
+ 					&extra_opts, &mount_opts,  0);
+ 		}
+ 	}
+-	if (fake)
+-		return 0;
+ 	if (mnt_err)
+ 		exit(EX_FAIL);
+ 
+-	mnt_err = do_mount_syscall(spec, mount_point,
+-			nfs_mount_vers == 4 ? "nfs4" : "nfs", flags, mount_opts);
++	if (!fake) {
++		mnt_err = do_mount_syscall(spec, mount_point,
++				nfs_mount_vers == 4 ? "nfs4" : "nfs", 
++				flags, mount_opts);
+ 
+-	if(mnt_err) {
+-		mount_error(mount_point);
+-		exit(EX_FAIL);
++		if (mnt_err) {
++			mount_error(mount_point);
++			exit(EX_FAIL);
++		}
+ 	}
+ 
+-	if(!nomtab) {
++	if (!nomtab) {
+ 		add_mtab(spec, mount_point, nfs_mount_vers == 4 ? "nfs4" : "nfs",
+ 			 flags, extra_opts, 0, 0);
+ 	}
diff --git a/nfs-utils.spec b/nfs-utils.spec
index 6e30320..3bea6a1 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -1,7 +1,7 @@
 Summary: NFS utlilities and supporting clients and daemons for the kernel NFS server.
 Name: nfs-utils
 Version: 1.0.11
-Release: 1%{?dist}
+Release: 2%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -44,6 +44,7 @@ Patch77: nfs-utils-1.0.10-mount-nfsvers.patch
 Patch78: nfs-utils-1.0.10-udp-no-connect.patch
 Patch79: nfs-utils-1.0.10-v4-umounts.patch
 Patch80: nfs-utils-1.0.9-mount-quotes.patch
+Patch81: nfs-utils-1.0.10-mount-fake.patch
 
 %if %{enablefscache}
 Patch90: nfs-utils-1.0.9-mount-fsc.patch
@@ -109,6 +110,7 @@ This package also contains the mount.nfs and umount.nfs program.
 %patch78 -p1
 %patch79 -p1
 %patch80 -p1
+%patch81 -p1
 %if %{enablefscache}
 %patch90 -p1
 %endif
@@ -285,6 +287,9 @@ fi
 %endif
 
 %changelog
+* Thu Mar  1 2007 Karel Zak <kzak@redhat.com>  1.0.11-2
+- Fixed mount.nfs -f (fake) option (bz 227988)
+
 * Thu Feb 22 2007 Steve Dickson <steved@redhat.com> 1.0.11-1
 - Upgraded to 1.0.11