diff --git a/nfs-utils-1.3.2-systemd-tmpfiles.patch b/nfs-utils-1.3.2-systemd-tmpfiles.patch new file mode 100644 index 0000000..5a17bea --- /dev/null +++ b/nfs-utils-1.3.2-systemd-tmpfiles.patch @@ -0,0 +1,42 @@ +From 68852818f732b31d3deb7cc76ef16f4e61c41aec Mon Sep 17 00:00:00 2001 +From: Colin Walters +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 +--- + 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 + diff --git a/nfs-utils.spec b/nfs-utils.spec index 692854c..56921ac 100644 --- a/nfs-utils.spec +++ b/nfs-utils.spec @@ -21,7 +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 +Patch104: nfs-utils-1.3.2-systemd-tmpfiles.patch Patch105: nfs-utils-1.3.2-systemd-gssargs.patch Group: System Environment/Daemons 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 deleted file mode 100644 index 5a17bea..0000000 --- a/systemd-Set-var-lib-nfs-rpc_pipefs.mount-After-tmpfi.patch +++ /dev/null @@ -1,42 +0,0 @@ -From 68852818f732b31d3deb7cc76ef16f4e61c41aec Mon Sep 17 00:00:00 2001 -From: Colin Walters -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 ---- - 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 -