1 Description: systemd: Mount rpc_pipefs in /run instead of /var/lib/nfs/
2 Author: Martin Pitt <martin.pitt@ubuntu.com>
5 Index: nfs-utils-1.2.8/systemd/var-lib-nfs-rpc_pipefs.mount
6 ===================================================================
7 --- nfs-utils-1.2.8.orig/systemd/var-lib-nfs-rpc_pipefs.mount
11 -Description=RPC Pipe File System
12 -DefaultDependencies=no
13 -Conflicts=umount.target
17 -Where=/var/lib/nfs/rpc_pipefs
19 Index: nfs-utils-1.2.8/systemd/nfs-blkmap.service
20 ===================================================================
21 --- nfs-utils-1.2.8.orig/systemd/nfs-blkmap.service
22 +++ nfs-utils-1.2.8/systemd/nfs-blkmap.service
24 Description=pNFS block layout mapping daemon
25 DefaultDependencies=no
26 Conflicts=umount.target
27 -After=var-lib-nfs-rpc_pipefs.mount
28 -Requires=var-lib-nfs-rpc_pipefs.mount
29 +After=run-rpc_pipefs.mount
30 +Requires=run-rpc_pipefs.mount
32 Requisite=nfs-blkmap.target
33 After=nfs-blkmap.target
34 Index: nfs-utils-1.2.8/systemd/nfs-idmapd.service
35 ===================================================================
36 --- nfs-utils-1.2.8.orig/systemd/nfs-idmapd.service
37 +++ nfs-utils-1.2.8/systemd/nfs-idmapd.service
40 Description=NFSv4 ID-name mapping service
41 DefaultDependencies=no
42 -Requires=var-lib-nfs-rpc_pipefs.mount
43 -After=var-lib-nfs-rpc_pipefs.mount local-fs.target
44 +Requires=run-rpc_pipefs.mount
45 +After=run-rpc_pipefs.mount local-fs.target
47 BindsTo=nfs-server.service
49 Index: nfs-utils-1.2.8/systemd/rpc-gssd.service
50 ===================================================================
51 --- nfs-utils-1.2.8.orig/systemd/rpc-gssd.service
52 +++ nfs-utils-1.2.8/systemd/rpc-gssd.service
54 Description=RPC security service for NFS client and server
55 DefaultDependencies=no
56 Conflicts=umount.target
57 -Requires=var-lib-nfs-rpc_pipefs.mount
58 -After=var-lib-nfs-rpc_pipefs.mount
59 +Requires=run-rpc_pipefs.mount
60 +After=run-rpc_pipefs.mount
62 ConditionPathExists=/etc/krb5.keytab
64 Index: nfs-utils-1.2.8/systemd/rpc-svcgssd.service
65 ===================================================================
66 --- nfs-utils-1.2.8.orig/systemd/rpc-svcgssd.service
67 +++ nfs-utils-1.2.8/systemd/rpc-svcgssd.service
70 Description=RPC security service for NFS server
71 DefaultDependencies=no
72 -Requires=var-lib-nfs-rpc_pipefs.mount
73 -After=var-lib-nfs-rpc_pipefs.mount local-fs.target
74 +Requires=run-rpc_pipefs.mount
75 +After=run-rpc_pipefs.mount local-fs.target
76 PartOf=nfs-server.service
77 PartOf=nfs-utils.service
79 Index: nfs-utils-1.2.8/systemd/run-rpc_pipefs.mount
80 ===================================================================
82 +++ nfs-utils-1.2.8/systemd/run-rpc_pipefs.mount
85 +Description=RPC Pipe File System
86 +DefaultDependencies=no
87 +Conflicts=umount.target
91 +Where=/run/rpc_pipefs