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 5168245c17c2c2aa4b199c29e8956a486bad8a59..25c00f30391ffbd1d38ed25eba6200c67e7ac840 100644 (file)
--- 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 2df5054f01b8bf885b94cb9a20d2e0d6b7c52a4d..af5c233350f47c9ba8970caf6ce33776a1b2e4da 100644 (file)
--- 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 84dcd324f209d67cad4b87538392b85eadc3b9f6..50ecd734b74fcc6e6ee5a21df1b8ca781e3be129 100644 (file)
--- 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 a0eab38795cef1a93796c11a4de89eff45027b1a..92691f9ae51ee325d6a63f8d37336c80a13f207d 100644 (file)
--- 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 8789183ce81ec6713ace2207c27e666d0b93f4ed..866c066186302b3ee5bd454dbdacd3d3e2afdf82 100644 (file)
--- 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 757468e95238ef6ad08cbdf8106ba34f3d6cdbb5..204ac7abb44f895199ec539c50b807bd3969f863 100755 (executable)
--- 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