Merge branch 'sid'

[nfs-utils.git] / debian / patches / 00git-start-statd-systemd.patch

diff --git a/debian/patches/00git-start-statd-systemd.patch b/debian/patches/00git-start-statd-systemd.patch
new file mode 100644 (file)
index 0000000..6da8857
--- /dev/null
+++ b/debian/patches/00git-start-statd-systemd.patch
@@ -0,0 +1,27 @@
+Description: Latest start-statd script from 1.3.2 to start rpc-statd.service under systemd
+Origin: upstream, from 1.3.2
+
+Index: nfs-utils-1.2.8/utils/statd/start-statd
+===================================================================
+--- nfs-utils-1.2.8.orig/utils/statd/start-statd
++++ nfs-utils-1.2.8/utils/statd/start-statd
+@@ -1,9 +1,16 @@
+-#!/bin/bash -p
++#!/bin/sh
+ # nfsmount calls this script when mounting a filesystem with locking
+ # enabled, but when statd does not seem to be running (based on
+ # /var/run/rpc.statd.pid).
+ # It should run statd with whatever flags are apropriate for this
+ # site.
+-PATH=/sbin:/usr/sbin
+-exec rpc.statd --no-notify
++PATH="/sbin:/usr/sbin:/bin:/usr/bin"
++
++# First try systemd if it's installed.
++if [ -d /run/systemd/system ]; then
++    # Quit only if the call worked.
++    systemctl start rpc-statd.service && exit
++fi
+ 
++# Fall back to launching it ourselves.
++exec rpc.statd --no-notify