- Fixed mount.nfs -f (fake) option (bz 227988)

This commit is contained in:
kzak 2007-03-01 22:34:44 +00:00
parent f2be8af9a9
commit a38af1c1d6
2 changed files with 41 additions and 1 deletions

View File

@ -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);
}

View File

@ -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