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

diff --git a/debian/nfs-common.init b/debian/nfs-common.init
index 92691f9..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
@@ -18,7 +18,6 @@ DESC="NFS common utilities"
 # Read config
 DEFAULTFILE=/etc/default/nfs-common
 NEED_STATD=
-NEED_IDMAPD=
 NEED_GSSD=
 PIPEFS_MOUNTPOINT=/run/rpc_pipefs
 RPCGSSDOPTS=
@@ -32,11 +31,10 @@ fi
 [ -x /sbin/rpc.statd ] || exit 0
 
 #
-# Parse the fstab file, and determine whether we need idmapd and gssd. (The
+# Parse the fstab file, and determine whether we need gssd. (The
 # /etc/defaults settings, if any, will override our autodetection.) This code
 # is partially adapted from the mountnfs.sh script in the sysvinit package.
 #
-AUTO_NEED_IDMAPD=no
 AUTO_NEED_GSSD=no
 
 if [ -f /etc/fstab ]; then
@@ -49,34 +47,21 @@ if [ -f /etc/fstab ]; then
 		continue
 		;;
 	esac
-	# FSTYPE "nfs" can be NFSv4 now
-        #if [ "$FSTYPE" = "nfs4" ]; then
-            AUTO_NEED_IDMAPD=yes
-        #fi
-        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<&-
 fi
 
-#
-# We also need idmapd if we run an NFSv4 server. It's fairly difficult
-# to autodetect whether there are NFSv4 exports or not, and idmapd is not a
-# particularily heavy daemon, so we auto-enable it if we find an /etc/exports
-# file. This does not mean that there are NFSv4 or other mounts active (or
-# even that nfs-kernel-server is installed), but it matches what the "start"
-# condition in nfs-kernel-server's init script does, which has a value in
-# itself.
-#
-if [ -f /etc/exports ] && grep -q '^[[:space:]]*[^#]*/' /etc/exports; then
-    AUTO_NEED_IDMAPD=yes
-fi
-
 case "$NEED_STATD" in
     yes|no)
         ;;
@@ -89,7 +74,7 @@ case "$NEED_IDMAPD" in
     yes|no)	
         ;;
     *)
-        NEED_IDMAPD=$AUTO_NEED_IDMAPD
+        NEED_IDMAPD=yes
 	;;
 esac
 
@@ -148,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
@@ -157,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