debian/patches/21-no-more-var-run.patch: PID files should be in /run, not /var/run...

diff --git a/debian/changelog b/debian/changelog
index 3f54cb8193d47f2fef552a13473cc1ae8b9696cc..65458eba55d4499a7ea293921d5433a7b4b72ed2 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,9 @@ nfs-utils (1:1.2.8-5) UNRELEASED; urgency=low
     support /var on NFS.
   * Don't start the nfs-common init script from the nfs-kernel-server
     maintainer script, this is entirely redundant.
     support /var on NFS.
   * Don't start the nfs-common init script from the nfs-kernel-server
     maintainer script, this is entirely redundant.

+  * debian/patches/21-no-more-var-run.patch: PID files should be in
+    /run, not /var/run.
+    Closes LP: #1157171.

 
  -- Ben Hutchings <ben@decadent.org.uk>  Mon, 23 Sep 2013 03:59:19 +0100
 
 
  -- Ben Hutchings <ben@decadent.org.uk>  Mon, 23 Sep 2013 03:59:19 +0100
 

diff --git a/debian/nfs-common.init b/debian/nfs-common.init
index 25ff4f757c7314544a122eb1c0e06638dc19f863..39f63f2c16ec60c009ac2237d32cf45c09dbc6fd 100644 (file)
--- a/debian/nfs-common.init
+++ b/debian/nfs-common.init
@@ -129,7 +129,7 @@ case "$1" in
                fi
            fi
            start-stop-daemon --start --oknodo --quiet \
                fi
            fi
            start-stop-daemon --start --oknodo --quiet \

-               --pidfile /var/run/rpc.statd.pid \
+               --pidfile /run/rpc.statd.pid \

                --exec /sbin/rpc.statd -- $STATDOPTS
            RET=$?
            if [ $RET != 0 ]; then
                --exec /sbin/rpc.statd -- $STATDOPTS
            RET=$?
            if [ $RET != 0 ]; then


@@ -138,7 +138,7 @@ case "$1" in
            else
                if [ -d /run/sendsigs.omit.d ]; then
                    rm -f /run/sendsigs.omit.d/statd
            else
                if [ -d /run/sendsigs.omit.d ]; then
                    rm -f /run/sendsigs.omit.d/statd

-                   ln -s /var/run/rpc.statd.pid /run/sendsigs.omit.d/statd
+                   ln -s /run/rpc.statd.pid /run/sendsigs.omit.d/statd

                fi
            fi
        fi
                fi
            fi
        fi

diff --git a/debian/patches/series b/debian/patches/series
index 47820875de8dfd3040faa3829abb25f170bd885c..bf91ce03e2712d55dd1afc919d08728199f65994 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
+21-no-more-var-run.patch

 01-sm-notify-in-sbin.patch
 02-524255-manpages.patch
 03-handle-mtab-symlink.patch
 01-sm-notify-in-sbin.patch
 02-524255-manpages.patch
 03-handle-mtab-symlink.patch