From a96f2608d93a8c16157f3f11e442bb8a98526a3d Mon Sep 17 00:00:00 2001 From: CentOS Sources Date: Mar 02 2017 15:23:57 +0000 Subject: import nfs-utils-1.3.0-0.33.el7_3 --- diff --git a/SOURCES/nfs-utils-1.3.0-systemd-rpcpipefs.patch b/SOURCES/nfs-utils-1.3.0-systemd-rpcpipefs.patch new file mode 100644 index 0000000..2e3001b --- /dev/null +++ b/SOURCES/nfs-utils-1.3.0-systemd-rpcpipefs.patch @@ -0,0 +1,38 @@ +commit 8b3abe3a0ae941f3f52f99bc44388b7beb3d9bb8 +Author: Colin Walters +Date: Fri Jun 26 09:31:16 2015 -0400 + + systemd: Set var-lib-nfs-rpc_pipefs.mount After= tmpfiles + + OSTree is a mechanism for atomic updates of operating systems, with + designs for how system state is managed; in particular, `/var` should + start out empty, and components are responsible for creating content + there at runtime. + + rpm-ostree consumes RPMs and commits them to an OSTree repository. + It has some support for automatically synthesizing systemd `tmpfiles.d` + snippets from RPM content in `/var` using systemd-tmpfiles. + + However, in this case nfs-utils wants a mount point directory, and + it's running before systemd-tmpfiles. It should be perfectly fine to + do this mount after tmpfiles has run. + + A better fix for this would be to move transient directories to + `/run`; However, that would be an invasive change, which can happen + after this fix. + + Signed-off-by: Colin Walters + Signed-off-by: Steve Dickson + +diff --git a/systemd/var-lib-nfs-rpc_pipefs.mount b/systemd/var-lib-nfs-rpc_pipefs.mount +index 33c5db6..26d1c76 100644 +--- a/systemd/var-lib-nfs-rpc_pipefs.mount ++++ b/systemd/var-lib-nfs-rpc_pipefs.mount +@@ -1,6 +1,7 @@ + [Unit] + Description=RPC Pipe File System + DefaultDependencies=no ++After=systemd-tmpfiles-setup.service + Conflicts=umount.target + + [Mount] diff --git a/SPECS/nfs-utils.spec b/SPECS/nfs-utils.spec index ef59f5b..8a12c48 100644 --- a/SPECS/nfs-utils.spec +++ b/SPECS/nfs-utils.spec @@ -90,6 +90,10 @@ Patch063: nfs-utils-1.3.0-statd-warnings.patch Patch064: nfs-utils-1.3.0-start-statd-flock.patch Patch065: nfs-utils-1.3.0-mountd-root.patch Patch066: nfs-utils-1.3.0-mount-nfs-types.patch +# +# RHEL7.3-Z +# +Patch067: nfs-utils-1.3.0-systemd-rpcpipefs.patch Patch100: nfs-utils-1.2.1-statdpath-man.patch Patch101: nfs-utils-1.2.1-exp-subtree-warn-off.patch @@ -280,6 +284,8 @@ This package also contains the mount.nfs and umount.nfs program. %patch065 -p1 # 1363737 - man mount.nfs incorrectly mentions the default mount.... %patch066 -p1 +# 1411653 - var-lib-nfs-rpc_pipefs.mount fails [rhel-7.3.z] +%patch067 -p1 %patch100 -p1 %patch101 -p1 @@ -534,6 +540,9 @@ fi /sbin/umount.nfs4 %changelog +* Thu Jan 12 2017 Steve Dickson 1.3.0-0.33.el7_3 +- systemd: Set var-lib-nfs-rpc_pipefs.mount After= tmpfiles (bz 1411653) + * Wed Aug 17 2016 Scott Mayhew 1.3.0-0.33 spec: clean up cruft left over by upgrade from older versions (bz 1203765)