rpms/nfs-utils
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Updated to the latest RC releease: nfs-utils-2-1-2-rc3 (bz 1457921)

Browse Source 
Signed-off-by: Steve Dickson <steved@redhat.com>
This commit is contained in:
Steve Dickson 2017-06-01 10:22:56 -04:00
parent 7afed0da24
commit 0b26fc789c
5 changed files with 2711 additions and 1149 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

66
nfs-utils-2.1.1-network-online.patch
View File

@ -1,66 +0,0 @@
commit 09e5c6c2a3f8eac91d5353e6d4ff6aee7757ab08
Author: Steve Dickson <steved@redhat.com>
Date: Mon Apr 24 11:25:39 2017 -0400
systemd: Afters are also needed for the Wants=network-online.target
Commit 9d4fc3fb added Wants=network-online.target which
is not enough to ensure the network is completely up
before the NFS server is started. After=network-online.target
is also needed.
Fixes: https://bugzilla.redhat.com/show_bug.cgi?id=1419351
Signed-off-by: Steve Dickson <steved@redhat.com>
diff --git a/systemd/nfs-mountd.service b/systemd/nfs-mountd.service
index fec0399..e8ece53 100644
--- a/systemd/nfs-mountd.service
+++ b/systemd/nfs-mountd.service
@@ -4,6 +4,7 @@ DefaultDependencies=no
Requires=proc-fs-nfsd.mount
Wants=network-online.target
After=proc-fs-nfsd.mount
+After=network-online.target local-fs.target
After=rpcbind.socket
BindsTo=nfs-server.service
diff --git a/systemd/nfs-server.service b/systemd/nfs-server.service
index e6b8f58..136552b 100644
--- a/systemd/nfs-server.service
+++ b/systemd/nfs-server.service
@@ -7,7 +7,7 @@ Wants=rpcbind.socket network-online.target
Wants=rpc-statd.service nfs-idmapd.service
Wants=rpc-statd-notify.service
-After= local-fs.target
+After= network-online.target local-fs.target
After= proc-fs-nfsd.mount rpcbind.socket nfs-mountd.service
After= nfs-idmapd.service rpc-statd.service
Before= rpc-statd-notify.service
diff --git a/systemd/rpc-statd-notify.service b/systemd/rpc-statd-notify.service
index f54d4c5..687fe31 100644
--- a/systemd/rpc-statd-notify.service
+++ b/systemd/rpc-statd-notify.service
@@ -2,7 +2,7 @@
Description=Notify NFS peers of a restart
DefaultDependencies=no
Wants=network-online.target
-After=local-fs.target network.target nss-lookup.target
+After=local-fs.target network-online.target nss-lookup.target
# if we run an nfs server, it needs to be running before we
# tell clients that it has restarted.
diff --git a/systemd/rpc-statd.service b/systemd/rpc-statd.service
index 8cef022..f41ae20 100644
--- a/systemd/rpc-statd.service
+++ b/systemd/rpc-statd.service
@@ -4,7 +4,7 @@ DefaultDependencies=no
Conflicts=umount.target
Requires=nss-lookup.target rpcbind.socket
Wants=network-online.target
-After=nss-lookup.target rpcbind.socket
+After=network-online.target nss-lookup.target rpcbind.socket
PartOf=nfs-utils.service

37
nfs-utils-2.1.1-nfsdcltrack-errors.patch
View File

@ -1,37 +0,0 @@
commit 06bbb4ee6f5186e8e83d50767ad5b3b41968e5a6
Author: Jeff Layton <jlayton@redhat.com>
Date: Wed Apr 26 12:13:50 2017 -0400
nfsdcltrack: silence some expected errors
On a new install, we're unable to select from the parameters table, as
it doesn't exist yet. The code is set up to log that fact at L_ERROR
now, but it's an expected situation. Change it to log that at D_GENERAL
instead.
Reported-and-Tested-by: ChunYu Wang <chunwang@redhat.com>
Signed-off-by: Jeff Layton <jlayton@redhat.com>
Signed-off-by: Steve Dickson <steved@redhat.com>
diff --git a/utils/nfsdcltrack/sqlite.c b/utils/nfsdcltrack/sqlite.c
index 54cd748..1552eba 100644
--- a/utils/nfsdcltrack/sqlite.c
+++ b/utils/nfsdcltrack/sqlite.c
@@ -101,7 +101,7 @@ sqlite_query_schema_version(void)
"SELECT value FROM parameters WHERE key == \"version\";",
-1, &stmt, NULL);
if (ret != SQLITE_OK) {
- xlog(L_ERROR, "Unable to prepare select statement: %s",
+ xlog(D_GENERAL, "Unable to prepare select statement: %s",
sqlite3_errmsg(dbh));
ret = 0;
goto out;
@@ -110,7 +110,7 @@ sqlite_query_schema_version(void)
/* query schema version */
ret = sqlite3_step(stmt);
if (ret != SQLITE_ROW) {
- xlog(L_ERROR, "Select statement execution failed: %s",
+ xlog(D_GENERAL, "Select statement execution failed: %s",
sqlite3_errmsg(dbh));
ret = 0;
goto out;

1040
nfs-utils-2.1.2-rc1.patch
View File

File diff suppressed because it is too large Load Diff

2706
nfs-utils-2.1.2-rc3.patch Normal file
View File

File diff suppressed because it is too large Load Diff

11
nfs-utils.spec
View File

@ -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: 2.1.1
Release: 5.rc2%{?dist}
Release: 5.rc3%{?dist}
Epoch: 1
# group all 32bit related archs
@ -15,9 +15,7 @@ Source3: nfs-utils_env.sh
Source4: lockd.conf
Source5: 24-nfs-server.conf
Patch001: nfs-utils-2.1.2-rc2.patch
Patch002: nfs-utils-2.1.1-network-online.patch
Patch003: nfs-utils-2.1.1-nfsdcltrack-errors.patch
Patch001: nfs-utils-2.1.2-rc3.patch
Patch100: nfs-utils-1.2.1-statdpath-man.patch
Patch101: nfs-utils-1.2.1-exp-subtree-warn-off.patch
@ -77,8 +75,6 @@ This package also contains the mount.nfs and umount.nfs program.
%setup -q
%patch001 -p1
%patch002 -p1
%patch003 -p1
%patch100 -p1
%patch101 -p1
@ -292,6 +288,9 @@ fi
/sbin/umount.nfs4
%changelog
* Thu Jun 1 2017 Steve Dickson <steved@redhat.com> 2.1.1-5.rc3
- Updated to the latest RC releease: nfs-utils-2-1-2-rc3 (bz 1457921)
* Wed Apr 26 2017 Steve Dickson <steved@redhat.com> 2.1.1-5.rc2
- Conditionally restart gssproxy now that config file is installed (bz 1440885)
- systemd: Afters are also needed for the Wants=network-online.target (bz 1419351)