← Back to branch summary

~ubuntu-branches/ubuntu/vivid/nfs-utils/vivid-proposed

« back to all changes in this revision

Viewing changes to debian/patches/27-systemd-start-nfs-idmapd-also-on-clients.patch

  • Committer: Package Import Robot
  • Author(s): Steve Langasek
  • Date: 2015-03-06 10:19:57 UTC
  • mfrom: (92.1.2 trunk)
  • Revision ID: package-import@ubuntu.com-20150306101957-7jpr3pzm12fcsi9g
Tags: 1:1.2.8-9ubuntu6
Revert previous upload; per upstream, rpc.idmapd is not used when the
nfsidmap utility is available and configured for use in request-key
upcalls.  So rpc.idmapd does not need to be started on clients anymore.

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/27-systemd-start-nfs-idmapd-also-on-clients.patch
1
 
From: Martin Pitt <martin.pitt@ubuntu.com>
2
 
Date: Fri, 6 Mar 2015 11:50:59 +0100
3
 
Subject: [PATCH] systemd: start nfs-idmapd also on clients
4
 
 
5
 
idmapd is needed for clients too, so start it from nfs-client.target
6
 
and stop binding to it in nfs-server.service.
7
 
 
8
 
https://launchpad.net/bugs/1428961
9
 
---
10
 
 systemd/nfs-client.target  | 4 ++--
11
 
 systemd/nfs-idmapd.service | 2 --
12
 
 2 files changed, 2 insertions(+), 4 deletions(-)
13
 
 
14
 
Index: nfs-utils-1.2.8/systemd/nfs-client.target
15
 
===================================================================
16
 
--- nfs-utils-1.2.8.orig/systemd/nfs-client.target
17
 
+++ nfs-utils-1.2.8/systemd/nfs-client.target
18
 
@@ -5,8 +5,8 @@ Wants=remote-fs-pre.target
19
 
 
20
 
 # Note: we don't "Wants=rpc-statd.service" as "mount.nfs" will arrange to
21
 
 # start that on demand if needed.
22
 
-Wants=nfs-blkmap.service rpc-statd-notify.service
23
 
-After=nfs-blkmap.service
24
 
+Wants=nfs-blkmap.service rpc-statd-notify.service nfs-idmapd.service
25
 
+After=nfs-blkmap.service nfs-idmapd.service
26
 
 
27
 
 # GSS services dependencies and ordering
28
 
 Wants=auth-rpcgss-module.service
29
 
Index: nfs-utils-1.2.8/systemd/nfs-idmapd.service
30
 
===================================================================
31
 
--- nfs-utils-1.2.8.orig/systemd/nfs-idmapd.service
32
 
+++ nfs-utils-1.2.8/systemd/nfs-idmapd.service
33
 
@@ -4,8 +4,6 @@ DefaultDependencies=no
34
 
 Requires=run-rpc_pipefs.mount
35
 
 After=run-rpc_pipefs.mount local-fs.target
36
 
 
37
 
-BindsTo=nfs-server.service
38
 
-
39
 
 Wants=nfs-config.service
40
 
 After=nfs-config.service
41