X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=debian%2Fnfs-kernel-server.init;h=0fa19bb021280061abedbbead57381297c0d47e8;hp=c2ee49bbee1f45b516efce39a6906405d88fa0cd;hb=827f2a0c8c7606ad0245bfa4b9c81075f0de18c7;hpb=24725201e1abc88e5e8859f8ece4a1dce1432d06

diff --git a/debian/nfs-kernel-server.init b/debian/nfs-kernel-server.init
index c2ee49b..0fa19bb 100755
--- a/debian/nfs-kernel-server.init
+++ b/debian/nfs-kernel-server.init
@@ -10,16 +10,24 @@
 #              which is configured via the /etc/exports file.
 #
 
+set -e
+
+# What is this?
+DESC="NFS kernel daemon"
 PREFIX=/usr
+
+# Exit if required binaries are missing.
 [ -x $PREFIX/sbin/rpc.nfsd ] || exit 0
 [ -x $PREFIX/sbin/rpc.mountd ] || exit 0
 [ -x $PREFIX/sbin/exportfs ] || exit 0
 
-# What is this?
-DESC="NFS kernel daemon"
-
-RPCNFSDCOUNT=8	# Number of servers to be started up by default
+# Read config
+DEFAULTFILE=/etc/default/nfs-kernel-server
+RPCNFSDCOUNT=8
 RPCMOUNTDOPTS=
+if [ -f $DEFAULTFILE ]; then
+    . $DEFAULTFILE
+fi
 
 # See how we were called.
 case "$1" in
@@ -36,7 +44,7 @@ case "$1" in
 		start-stop-daemon --start --quiet \
 		    --exec $PREFIX/sbin/rpc.nfsd -- $RPCNFSDCOUNT
 		printf " mountd"
-		$PREFIX/bin/rpcinfo -u localhost nfs 3 > /dev/null 2>&1 ||
+		$PREFIX/bin/rpcinfo -u localhost nfs 3 >/dev/null 2>&1 ||
 		    RPCMOUNTDOPTS="$RPCMOUNTDOPTS --no-nfs-version 3"
 		start-stop-daemon --start --quiet \
 		    --exec $PREFIX/sbin/rpc.mountd -- $RPCMOUNTDOPTS
@@ -49,10 +57,10 @@ case "$1" in
   stop)
 	printf "Stopping $DESC: mountd"
 	start-stop-daemon --stop --oknodo --quiet \
-	    --exec $PREFIX/sbin/rpc.mountd
+	    --name rpc.mountd --user 0
 	printf " nfsd"
 	start-stop-daemon --stop --oknodo --quiet \
-	    --name nfsd --user root --signal 2
+	    --name nfsd --user 0 --signal 2
 	echo "."
 
 	printf "Unexporting directories for $DESC..."
@@ -79,4 +87,3 @@ case "$1" in
 esac
 
 exit 0
-