From cca8a4b6cbd34158c4f2fdd462297b0b4ccec881 Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Dec 12 2020 08:09:18 +0000 Subject: import nfs-utils-2.3.3-39.el8 --- diff --git a/SOURCES/nfs-utils-2.3.1-systemd-gssproxy-restart.patch b/SOURCES/nfs-utils-2.3.1-systemd-gssproxy-restart.patch index 60762e8..f298b89 100644 --- a/SOURCES/nfs-utils-2.3.1-systemd-gssproxy-restart.patch +++ b/SOURCES/nfs-utils-2.3.1-systemd-gssproxy-restart.patch @@ -1,9 +1,9 @@ -diff -up nfs-utils-2.3.1/systemd/nfs-server.service.orig nfs-utils-2.3.1/systemd/nfs-server.service ---- nfs-utils-2.3.1/systemd/nfs-server.service.orig 2018-01-19 10:25:38.153513857 -0500 -+++ nfs-utils-2.3.1/systemd/nfs-server.service 2018-01-19 10:30:52.977245126 -0500 -@@ -26,6 +26,7 @@ Type=oneshot +diff -up nfs-utils-2.3.3/systemd/nfs-server.service.orig nfs-utils-2.3.3/systemd/nfs-server.service +--- nfs-utils-2.3.3/systemd/nfs-server.service.orig 2020-12-11 09:05:23.499222371 -0500 ++++ nfs-utils-2.3.3/systemd/nfs-server.service 2020-12-11 09:06:38.970186395 -0500 +@@ -23,6 +23,7 @@ Type=oneshot RemainAfterExit=yes - ExecStartPre=/usr/sbin/exportfs -r + ExecStartPre=-/usr/sbin/exportfs -r ExecStart=/usr/sbin/rpc.nfsd +ExecStart=-/bin/sh -c 'if systemctl -q is-active gssproxy; then systemctl reload gssproxy ; fi' ExecStop=/usr/sbin/rpc.nfsd 0 diff --git a/SOURCES/nfs-utils-2.3.3-exports-manpage-outdated.patch b/SOURCES/nfs-utils-2.3.3-exports-manpage-outdated.patch new file mode 100644 index 0000000..1660781 --- /dev/null +++ b/SOURCES/nfs-utils-2.3.3-exports-manpage-outdated.patch @@ -0,0 +1,30 @@ +commit ba90d61be3abca5a699765ce08759ca6b986781d +Author: Steve Dickson +Date: Thu Dec 10 14:05:23 2020 -0500 + + exports.man: Remove some outdated verbiage + + Years ago, commit 6a7d90cea765 removed the warning + this verbiage was talking about, but was never + removed from the man page. + + Signed-off-by: Steve Dickson + +diff --git a/utils/exportfs/exports.man b/utils/exportfs/exports.man +index 1d171849..54b3f877 100644 +--- a/utils/exportfs/exports.man ++++ b/utils/exportfs/exports.man +@@ -169,13 +169,6 @@ default. In all releases after 1.0.0, + is the default, and + .I async + must be explicitly requested if needed. +-To help make system administrators aware of this change, +-.B exportfs +-will issue a warning if neither +-.I sync +-nor +-.I async +-is specified. + .TP + .IR no_wdelay + This option has no effect if diff --git a/SOURCES/nfs-utils-2.3.3-systemd-exportfs-nofail.patch b/SOURCES/nfs-utils-2.3.3-systemd-exportfs-nofail.patch new file mode 100644 index 0000000..a41bdd7 --- /dev/null +++ b/SOURCES/nfs-utils-2.3.3-systemd-exportfs-nofail.patch @@ -0,0 +1,37 @@ +commit 003000d451833309c963054e58a48fa1df7e767b +Author: Steve Dickson +Date: Thu Dec 10 13:13:03 2020 -0500 + + exportfs: Ingnore export failures in nfs-server.serivce unit + + With some recent commits, exportfs will continue on trying to + export filesystems even when an entry is invalid or does + not exist, but will still have a non-zero exit to report + the error. + + This situation should not stop the nfs-server service + from comingup so nfs-server.service file should + ignore these types of failures + + Signed-off-by: Steve Dickson + +diff --git a/systemd/nfs-server.service b/systemd/nfs-server.service +index 06c1adb7..b432f910 100644 +--- a/systemd/nfs-server.service ++++ b/systemd/nfs-server.service +@@ -21,13 +21,13 @@ After=rpc-gssd.service gssproxy.service rpc-svcgssd.service + [Service] + Type=oneshot + RemainAfterExit=yes +-ExecStartPre=/usr/sbin/exportfs -r ++ExecStartPre=-/usr/sbin/exportfs -r + ExecStart=/usr/sbin/rpc.nfsd + ExecStop=/usr/sbin/rpc.nfsd 0 + ExecStopPost=/usr/sbin/exportfs -au + ExecStopPost=/usr/sbin/exportfs -f + +-ExecReload=/usr/sbin/exportfs -r ++ExecReload=-/usr/sbin/exportfs -r + + [Install] + WantedBy=multi-user.target diff --git a/SPECS/nfs-utils.spec b/SPECS/nfs-utils.spec index 8597622..ca91f8c 100644 --- a/SPECS/nfs-utils.spec +++ b/SPECS/nfs-utils.spec @@ -2,7 +2,7 @@ Summary: NFS utilities and supporting clients and daemons for the kernel NFS ser Name: nfs-utils URL: http://linux-nfs.org/ Version: 2.3.3 -Release: 38%{?dist} +Release: 39%{?dist} Epoch: 1 # group all 32bit related archs @@ -62,12 +62,14 @@ Patch028: nfs-utils-2.3.3-nfsdclddb-rename.patch Patch029: nfs-utils-2.3.3-nfsclnts-cmd.patch # -# RHEL 8.3 +# RHEL 8.4 # Patch030: nfs-utils-2.3.3-exportfs-man-labels.patch Patch031: nfs-utils-2.3.3-nfsiostat-div-zero.patch Patch032: nfs-utils-2.3.3-nfsiostat-key-error.patch Patch033: nfs-utils-2.3.3-nfsdclddb-manpage-rename.patch +Patch034: nfs-utils-2.3.3-systemd-exportfs-nofail.patch +Patch035: nfs-utils-2.3.3-exports-manpage-outdated.patch Patch100: nfs-utils-1.2.1-statdpath-man.patch Patch101: nfs-utils-1.2.1-exp-subtree-warn-off.patch @@ -351,6 +353,10 @@ fi %{_libdir}/libnfsidmap.so %changelog +* Fri Dec 11 2020 08:54:06 AM EST +- systemd: Ingnore export failures in nfs-server.serivce unit (bz 1894873) +- exports.man: Remove some outdated verbiage (bz 1769688) + * Thu Dec 10 2020 Steve Dickson 2.3.3-38 - exports man page: warn about subdirectory exports (bz 1652437) - Don't modify /etc/group on upgrades (bz 1856881)