more gss fixes

[nfs-utils.git] / debian / nfs-kernel-server.init

diff --git a/debian/nfs-kernel-server.init b/debian/nfs-kernel-server.init
index d500ebcae56679cfd17f37159ddb66873d0c1e11..23215ecf9f046c69aaee1575bf5693b7b470034b 100755 (executable)
--- a/debian/nfs-kernel-server.init
+++ b/debian/nfs-kernel-server.init
@@ -20,11 +20,15 @@ PREFIX=/usr
 [ -x $PREFIX/sbin/rpc.nfsd ] || exit 0
 [ -x $PREFIX/sbin/rpc.mountd ] || exit 0
 [ -x $PREFIX/sbin/exportfs ] || exit 0
+[ -x $PREFIX/sbin/rpc.svcgssd ] || exit 0
 
 # Read config
 DEFAULTFILE=/etc/default/nfs-kernel-server
 RPCNFSDCOUNT=8
 RPCMOUNTDOPTS=
+NEED_SVCGSSD=yes
+RPCGSSDOPTS=
+RPCSVCGSSDOPTS=
 PROCNFSD_MOUNTPOINT=/proc/fs/nfsd
 if [ -f $DEFAULTFILE ]; then
     . $DEFAULTFILE
@@ -54,12 +58,20 @@ case "$1" in
        if grep -q '^/' /etc/exports
        then
                do_modprobe nfsd
-               do_mount nfsd $PROCNFSD_MOUNTPOINT || true
+               do_mount nfsd $PROCNFSD_MOUNTPOINT || NEED_SVCGSSD=no
                printf "Exporting directories for $DESC..."
                $PREFIX/sbin/exportfs -r
                echo "done."
 
                printf "Starting $DESC:"
+               if [ "$NEED_SVCGSSD" = yes ]
+               then
+                   printf " svcgssd"
+                   start-stop-daemon --start --quiet \
+                           --make-pidfile --pidfile /var/run/rpc.svcgssd.pid \
+                           --exec $PREFIX/sbin/rpc.svcgssd -- $RPCSVCGSSDOPTS
+               fi
+
                printf " nfsd"
                start-stop-daemon --start --quiet \
                    --exec $PREFIX/sbin/rpc.nfsd -- $RPCNFSDCOUNT
@@ -93,6 +105,13 @@ case "$1" in
        printf "Stopping $DESC: mountd"
        start-stop-daemon --stop --oknodo --quiet \
            --name rpc.mountd --user 0
+       if [ "$NEED_SVCGSSD" = yes ]
+       then
+           printf " svcgssd"
+           start-stop-daemon --stop --oknodo --quiet \
+                   --name rpc.svcgssd --user 0
+           rm -f /var/run/rpc.svcgssd.pid
+       fi
        printf " nfsd"
        start-stop-daemon --stop --oknodo --quiet \
            --name nfsd --user 0 --signal 2