From: Luk Claes <luk@debian.org>
Date: Mon, 13 May 2013 17:34:10 +0000 (+0200)
Subject: Add id_resolver.conf to fix nfsidmap invocation (Closes: #708156, #638157, #707960).
X-Git-Tag: debian/1%1.2.8-3~5
X-Git-Url: https://git.decadent.org.uk/gitweb/?a=commitdiff_plain;h=1d5d55dffa02f06331797ed7726c73a9a54c4257;p=nfs-utils.git

Add id_resolver.conf to fix nfsidmap invocation (Closes: #708156, #638157, #707960).
---

diff --git a/debian/changelog b/debian/changelog
index 6a6127f..b72e021 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
 nfs-utils (1:1.2.8-2) UNRELEASED; urgency=low
 
   * Fix reportbug scripts to use rpcinfo in /usr/sbin.
+  * Add id_resolver.conf to fix nfsidmap invocation
+    (Closes: #708156, #638157, #707960).
 
  -- Luk Claes <luk@zomers.be>  Sun, 12 May 2013 15:38:54 +0200
 
diff --git a/debian/id_resolver.conf b/debian/id_resolver.conf
new file mode 100644
index 0000000..2c156c6
--- /dev/null
+++ b/debian/id_resolver.conf
@@ -0,0 +1 @@
+create	id_resolver	*	*	/usr/sbin/nfsidmap -t 600 %k %d
diff --git a/debian/nfs-common.install b/debian/nfs-common.install
index ba58883..d194540 100644
--- a/debian/nfs-common.install
+++ b/debian/nfs-common.install
@@ -21,3 +21,4 @@ debian/tmp/usr/sbin/rpcdebug
 debian/tmp/var/lib/nfs/state
 debian/idmapd.conf usr/share/nfs-common/conffiles/
 debian/nfs-common.default usr/share/nfs-common/conffiles/
+debian/id_resolver.conf etc/request-key.d/