From: Steve Langasek <steve.langasek@canonical.com>
Date: Sun, 11 Aug 2013 03:18:25 +0000 (+0200)
Subject: Migrate the rpc_pipefs mount out of /var/lib to /run, to better support /var on NFS.
X-Git-Tag: debian/1%1.2.8-6~14
X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=commitdiff_plain;h=6352825b8c7596ff09a3f84cff231999aca23ba6

Migrate the rpc_pipefs mount out of /var/lib to /run, to better support /var on NFS.
---

diff --git a/debian/changelog b/debian/changelog
index 5168245..25c00f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,10 @@ nfs-utils (1:1.2.8-5) UNRELEASED; urgency=low
 
   * Remove Luk Claes from uploaders (Closes: #723602)
 
+  [ Steve Langasek ]
+  * Migrate the rpc_pipefs mount out of /var/lib to /run, to better
+    support /var on NFS.
+
  -- Ben Hutchings <ben@decadent.org.uk>  Mon, 23 Sep 2013 03:59:19 +0100
 
 nfs-utils (1:1.2.8-4) unstable; urgency=low
diff --git a/debian/idmapd.conf b/debian/idmapd.conf
index 2df5054..af5c233 100644
--- a/debian/idmapd.conf
+++ b/debian/idmapd.conf
@@ -1,7 +1,7 @@
 [General]
 
 Verbosity = 0
-Pipefs-Directory = /var/lib/nfs/rpc_pipefs
+Pipefs-Directory = /run/rpc_pipefs
 # set your own domain here, if id differs from FQDN minus hostname
 # Domain = localdomain
 
diff --git a/debian/nfs-common.dirs b/debian/nfs-common.dirs
index 84dcd32..50ecd73 100644
--- a/debian/nfs-common.dirs
+++ b/debian/nfs-common.dirs
@@ -4,7 +4,6 @@ usr/sbin
 var/lib/nfs
 var/lib/nfs/sm
 var/lib/nfs/sm.bak
-var/lib/nfs/rpc_pipefs
 usr/share/nfs-common/conffiles
 usr/share/bug/nfs-common
 usr/share/bug/nfs-utils
diff --git a/debian/nfs-common.init b/debian/nfs-common.init
index a0eab38..92691f9 100644
--- a/debian/nfs-common.init
+++ b/debian/nfs-common.init
@@ -20,7 +20,7 @@ DEFAULTFILE=/etc/default/nfs-common
 NEED_STATD=
 NEED_IDMAPD=
 NEED_GSSD=
-PIPEFS_MOUNTPOINT=/var/lib/nfs/rpc_pipefs
+PIPEFS_MOUNTPOINT=/run/rpc_pipefs
 RPCGSSDOPTS=
 if [ -f $DEFAULTFILE ]; then
     . $DEFAULTFILE
@@ -172,6 +172,7 @@ case "$1" in
 	    do_modprobe sunrpc
 	    do_modprobe nfs
 	    do_modprobe nfsd
+	    mkdir -p "$PIPEFS_MOUNTPOINT"
 	    if do_mount rpc_pipefs $PIPEFS_MOUNTPOINT
 	    then
 	    	if [ "$NEED_IDMAPD" = yes ]
diff --git a/debian/nfs-common.postinst b/debian/nfs-common.postinst
index 8789183..866c066 100644
--- a/debian/nfs-common.postinst
+++ b/debian/nfs-common.postinst
@@ -26,7 +26,6 @@ case "$1" in
 
         chown statd: /var/lib/nfs/sm \
             /var/lib/nfs/sm.bak \
-            /var/lib/nfs/rpc_pipefs \
             /var/lib/nfs
         if [ -f /var/lib/nfs/state ]; then
             chown statd /var/lib/nfs/state
diff --git a/debian/rules b/debian/rules
index 757468e..204ac7a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,7 +2,9 @@
 
 # Parsing of DEB_BUILD_OPTIONS flags.
 # Note that nostrip is handled automatically by debhelper.
-CFLAGS := -g -Wall
+CFLAGS := -g -Wall -DPIPEFS_DIR=\\\"/run/rpc_pipefs\\\" \
+		-DGSSD_PIPEFS_DIR=\\\"/run/rpc_pipefs\\\"
+
 ifneq (,$(filter noopt,$(DEB_BUILD_OPTIONS)))
     CFLAGS += -O0
 else