* Start nfs-common after nfs-kernel-server so that the server is running

    when statd restarts.  In postinst, remove bad rc.d links from old
    packages.  From Philippe Troin <phil@fifi.org>.  (closes: #160800)
  * Make init scripts exit with non-zero status when daemons don't start.
  * Add titles to templates where I forgot them.  (closes: #158489)
  * Add /etc/default/{nfs-common,nfs-kernel-server} so setting random
    parameters doesn't require editing init scripts.  (closes: #131539)
  * Split templates into separate files, and add French templates.
    (closes: #134630)
  * Use invoke-rc.d to avoid premature daemon starts.  (closes: 158574)
  * Change priority of nfs-kernel-server to 'optional'.

1 files changed, 26 insertions, 16 deletions

diff --git a/debian/nfs-common.init b/debian/nfs-common.init
index 2ae17b3..f6c4a8a 100755
--- a/debian/nfs-common.init
+++ b/debian/nfs-common.init
@@ -9,26 +9,36 @@
 #	       locking functionality.
 #
 
-PREFIX=
+set -e
 
-# Should rpc.statd listen on a specific port?
-# If so, set this variable to a statd argument like: "--port 1000".
-STATDPORT=""
+# What is this?
+DESC="NFS common utilities"
 
-NEED_LOCKD=yes
-if test -f /proc/ksyms
-then
-    # We need to be conservative and run lockd,
-    # unless we can prove that it isn't required.
-    grep -q lockdctl /proc/ksyms || NEED_LOCKD=no
+# Read config
+DEFAULTFILE=/etc/default/nfs-common
+PREFIX=
+NEED_LOCKD=
+if [ -f $DEFAULTFILE ]; then
+    . $DEFAULTFILE
 fi
 
+# Determine whether lockd is required
+case "$NEED_LOCKD" in
+yes|no)	;;
+*)  # We must be conservative and run lockd,
+    #  unless we can prove that it's not required.
+    NEED_LOCKD=yes
+    if test -f /proc/ksyms
+    then
+	grep -q lockdctl /proc/ksyms || NEED_LOCKD=no
+    fi
+    ;;
+esac
+
+# Exit if required binaries are missing.
 [ -x $PREFIX/sbin/rpc.statd ] || exit 0
 [ -x $PREFIX/sbin/rpc.lockd ] || [ "$NEED_LOCKD" = no ] || exit 0
 
-# What is this?
-DESC="NFS common utilities"
-
 # See how we were called.
 case "$1" in
   start)
@@ -36,12 +46,12 @@ case "$1" in
 	printf "Starting $DESC:"
 	printf " statd"
 	start-stop-daemon --start --quiet \
-	    --exec $PREFIX/sbin/rpc.statd -- $STATDPORT
+	    --exec $PREFIX/sbin/rpc.statd -- $STATDOPTS
 	if [ "$NEED_LOCKD" = yes ]
 	then
 	    printf " lockd"
 	    start-stop-daemon --start --quiet \
-		--exec $PREFIX/sbin/rpc.lockd
+		--exec $PREFIX/sbin/rpc.lockd  || true
 	fi
 	echo "."
 	;;
@@ -52,7 +62,7 @@ case "$1" in
 	then
 	    printf " lockd"
 	    start-stop-daemon --stop --oknodo --quiet \
-		--name rpc.lockd --user 0
+		--name rpc.lockd --user 0  || true
 	fi
 	printf " statd"
 	start-stop-daemon --stop --oknodo --quiet \