From feea4f146dc282fcea12feb8085e7bd9ff7abd6a Mon Sep 17 00:00:00 2001
From: Colin Walters <walters@verbum.org>
Date: Sat, 9 May 2015 11:56:34 -0400
Subject: [PATCH] Add patch
 systemd-Set-var-lib-nfs-rpc_pipefs.mount-After-tmpfi.patch

---
 nfs-utils.spec                                |  4 +-
 ...lib-nfs-rpc_pipefs.mount-After-tmpfi.patch | 42 +++++++++++++++++++
 2 files changed, 45 insertions(+), 1 deletion(-)
 create mode 100644 systemd-Set-var-lib-nfs-rpc_pipefs.mount-After-tmpfi.patch

diff --git a/nfs-utils.spec b/nfs-utils.spec
index d85c579..c98ecd8 100644
--- a/nfs-utils.spec
+++ b/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://sourceforge.net/projects/nfs
 Version: 1.3.2
-Release: 4%{?dist}
+Release: 5%{?dist}
 Epoch: 1
 
 # group all 32bit related archs
@@ -21,6 +21,7 @@ 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
 Patch103: nfs-utils-1.2.5-idmap-errmsg.patch
+Patch104: systemd-Set-var-lib-nfs-rpc_pipefs.mount-After-tmpfi.patch
 
 Group: System Environment/Daemons
 Provides: exportfs    = %{epoch}:%{version}-%{release}
@@ -78,6 +79,7 @@ This package also contains the mount.nfs and umount.nfs program.
 %patch101 -p1
 %patch102 -p1
 %patch103 -p1
+%patch104 -p1
 
 # Remove .orig files
 find . -name "*.orig" | xargs rm -f
diff --git a/systemd-Set-var-lib-nfs-rpc_pipefs.mount-After-tmpfi.patch b/systemd-Set-var-lib-nfs-rpc_pipefs.mount-After-tmpfi.patch
new file mode 100644
index 0000000..5a17bea
--- /dev/null
+++ b/systemd-Set-var-lib-nfs-rpc_pipefs.mount-After-tmpfi.patch
@@ -0,0 +1,42 @@
+From 68852818f732b31d3deb7cc76ef16f4e61c41aec Mon Sep 17 00:00:00 2001
+From: Colin Walters <walters@verbum.org>
+Date: Sat, 9 May 2015 11:29:20 -0400
+Subject: [PATCH] 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 <walters@verbum.org>
+---
+ systemd/var-lib-nfs-rpc_pipefs.mount | 1 +
+ 1 file changed, 1 insertion(+)
+
+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]
+-- 
+1.8.3.1
+