X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=debian%2Fnfs-common.init;h=052de51a08593d39a179cf0987d6dcd238658bf7;hp=25ff4f757c7314544a122eb1c0e06638dc19f863;hb=HEAD;hpb=97820a9040bdfe3bccdbfc58b1df88883bba0abe

diff --git a/debian/nfs-common.init b/debian/nfs-common.init
index 25ff4f7..052de51 100644
--- a/debian/nfs-common.init
+++ b/debian/nfs-common.init
@@ -4,7 +4,7 @@
 # Provides:          nfs-common
 # Required-Start:    $portmap $time
 # Required-Stop:     $time
-# Default-Start:     2 3 4 5 S
+# Default-Start:     S
 # Default-Stop:      0 1 6
 # Short-Description: NFS support files common to client and server
 # Description:       NFS is a popular protocol for file sharing across
@@ -47,12 +47,16 @@ if [ -f /etc/fstab ]; then
 		continue
 		;;
 	esac
-        case "$OPTS" in
-
-            sec=krb5|*,sec=krb5|sec=krb5,*|*,sec=krb5i,*|sec=krb5i|*,sec=krb5i|sec=krb5i,*|*,sec=krb5i,*|sec=krb5p|*,sec=krb5p|sec=krb5p,*|*,sec=krb5p,*)
-    	    AUTO_NEED_GSSD=yes
-            ;;
-        esac
+	OLDIFS="$IFS"
+	IFS=","
+	for OPT in $OPTS; do
+	    case "$OPT" in
+		sec=krb5|sec=krb5i|sec=krb5p)
+		    AUTO_NEED_GSSD=yes
+		;;
+	    esac
+	done
+	IFS="$OLDIFS"
     done
 
     exec 0<&9 9<&-
@@ -129,7 +133,7 @@ case "$1" in
 		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
@@ -138,7 +142,7 @@ case "$1" in
 	    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