Updated to latest upstream RC release: nfs-utils-1-3-2-rc1 (bz 1142842)
Signed-off-by: Steve Dickson <steved@redhat.com>
This commit is contained in:
parent
5747f80f3d
commit
c4b85f02a6
71
nfs-utils-1.3.2-rc1.patch
Normal file
71
nfs-utils-1.3.2-rc1.patch
Normal file
@ -0,0 +1,71 @@
|
||||
diff --git a/systemd/auth-rpcgss-module.service b/systemd/auth-rpcgss-module.service
|
||||
index 3fc2f4a..0355e13 100644
|
||||
--- a/systemd/auth-rpcgss-module.service
|
||||
+++ b/systemd/auth-rpcgss-module.service
|
||||
@@ -6,7 +6,8 @@
|
||||
# unit will fail. But that's OK.)
|
||||
[Unit]
|
||||
Description=Kernel Module supporting RPCSEC_GSS
|
||||
-Before=gssproxy.service rpc-svcgssd.service
|
||||
+Before=gssproxy.service rpc-svcgssd.service rpc-gssd.service
|
||||
+Wants=gssproxy.service rpc-svcgssd.service rpc-gssd.service
|
||||
ConditionPathExists=/etc/krb5.keytab
|
||||
|
||||
[Service]
|
||||
diff --git a/systemd/nfs-client.target b/systemd/nfs-client.target
|
||||
index 474f5e9..9b792a3 100644
|
||||
--- a/systemd/nfs-client.target
|
||||
+++ b/systemd/nfs-client.target
|
||||
@@ -5,9 +5,12 @@ Wants=remote-fs-pre.target
|
||||
|
||||
# Note: we don't "Wants=rpc-statd.service" as "mount.nfs" will arrange to
|
||||
# start that on demand if needed.
|
||||
-Wants=rpc-gssd.service rpc-svcgssd.service auth-rpcgss-module.service
|
||||
Wants=nfs-blkmap.service rpc-statd-notify.service
|
||||
-Before=rpc-gssd.service rpc-svcgssd.service nfs-blkmap.service
|
||||
+After=nfs-blkmap.service
|
||||
+
|
||||
+# GSS services dependencies and ordering
|
||||
+Wants=auth-rpcgss-module.service
|
||||
+After=rpc-gssd.service rpc-svcgssd.service gssproxy.service
|
||||
|
||||
[Install]
|
||||
WantedBy=multi-user.target
|
||||
diff --git a/systemd/nfs-server.service b/systemd/nfs-server.service
|
||||
index 1048c5c..8010aad 100644
|
||||
--- a/systemd/nfs-server.service
|
||||
+++ b/systemd/nfs-server.service
|
||||
@@ -2,15 +2,17 @@
|
||||
Description=NFS server and services
|
||||
Requires= network.target proc-fs-nfsd.mount rpcbind.target
|
||||
Requires= nfs-mountd.service
|
||||
-Wants=rpc-statd.service nfs-idmapd.service auth-rpcgss-module.service
|
||||
-Wants=rpc-gssd.service gssproxy.service rpc-svcgssd.service
|
||||
+Wants=rpc-statd.service nfs-idmapd.service
|
||||
Wants=rpc-statd-notify.service
|
||||
|
||||
After= network.target proc-fs-nfsd.mount rpcbind.target nfs-mountd.service
|
||||
After= nfs-idmapd.service rpc-statd.service
|
||||
-After= rpc-gssd.service gssproxy.service rpc-svcgssd.service
|
||||
Before= rpc-statd-notify.service
|
||||
|
||||
+# GSS services dependencies and ordering
|
||||
+Wants=auth-rpcgss-module.service
|
||||
+After=rpc-gssd.service gssproxy.service rpc-svcgssd.service
|
||||
+
|
||||
Wants=nfs-config.service
|
||||
After=nfs-config.service
|
||||
|
||||
diff --git a/utils/nfsstat/nfsstat.c b/utils/nfsstat/nfsstat.c
|
||||
index 18e4d27..9f481db 100644
|
||||
--- a/utils/nfsstat/nfsstat.c
|
||||
+++ b/utils/nfsstat/nfsstat.c
|
||||
@@ -558,7 +558,7 @@ print_server_stats(int opt_prt)
|
||||
;
|
||||
} else {
|
||||
print_numbers(LABEL_srvrpc
|
||||
- "calls badcalls badclnt badauth xdrcall\n",
|
||||
+ "calls badcalls badfmt badauth badclnt\n",
|
||||
srvrpcinfo, 5);
|
||||
printf("\n");
|
||||
}
|
@ -2,7 +2,7 @@ Summary: NFS utilities and supporting clients and daemons for the kernel NFS ser
|
||||
Name: nfs-utils
|
||||
URL: http://sourceforge.net/projects/nfs
|
||||
Version: 1.3.1
|
||||
Release: 0.0%{?dist}
|
||||
Release: 1.0%{?dist}
|
||||
Epoch: 1
|
||||
|
||||
# group all 32bit related archs
|
||||
@ -15,6 +15,8 @@ Source2: nfs.sysconfig
|
||||
Source3: nfs-utils_env.sh
|
||||
Source4: lockd.conf
|
||||
|
||||
Patch001: nfs-utils-1.3.2-rc1.patch
|
||||
|
||||
Patch100: nfs-utils-1.2.1-statdpath-man.patch
|
||||
Patch101: nfs-utils-1.2.1-exp-subtree-warn-off.patch
|
||||
Patch102: nfs-utils-1.2.3-sm-notify-res_init.patch
|
||||
@ -71,6 +73,8 @@ This package also contains the mount.nfs and umount.nfs program.
|
||||
%prep
|
||||
%setup -q
|
||||
|
||||
%patch001 -p1
|
||||
|
||||
%patch100 -p1
|
||||
%patch101 -p1
|
||||
%patch102 -p1
|
||||
@ -279,6 +283,9 @@ fi
|
||||
/sbin/umount.nfs4
|
||||
|
||||
%changelog
|
||||
* Wed Oct 22 2014 Steve Dickson <steved@redhat.com> 1.3.1-1.0
|
||||
- Updated to latest upstream RC release: nfs-utils-1-3-2-rc1 (bz 1142842)
|
||||
|
||||
* Thu Sep 25 2014 Steve Dickson <steved@redhat.com> 1.3.1-0.0
|
||||
- Update to the latest upstream release: nfs-utils-1-3-1
|
||||
- Enable gssproxy to manage the GSSAPI creds on the server.
|
||||
|
Loading…
Reference in New Issue
Block a user