X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=debian%2Fnfs-common.init;h=c46e832a3c58442b0ff964bff4991bb9aadf76f2;hp=f6c4a8ad2a3bad07c8019c0b6f7534a440c4f45a;hb=5206cbfa8934cb7331a840f3446d35cdbb795e34;hpb=e2d471f26fe47530d1d8fee9fdf1330203d458bc

diff --git a/debian/nfs-common.init b/debian/nfs-common.init
index f6c4a8a..c46e832 100755
--- a/debian/nfs-common.init
+++ b/debian/nfs-common.init
@@ -18,26 +18,60 @@ DESC="NFS common utilities"
 DEFAULTFILE=/etc/default/nfs-common
 PREFIX=
 NEED_LOCKD=
+NEED_IDMAPD=yes
+IDMAPD_PIDFILE=/var/run/rpc.idmapd.pid
+NEED_GSSD=yes
+GSSD_PIDFILE=/var/run/rpc.gssd.pid
+PIPEFS_MOUNTPOINT=/var/lib/nfs/rpc_pipefs
+RPCGSSDOPTS=
 if [ -f $DEFAULTFILE ]; then
     . $DEFAULTFILE
 fi
 
-# Determine whether lockd is required
+# Determine whether lockd daemon 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
+*)  case `uname -r` in
+    '' | [01].* | 2.[0123].* )
+	# Older kernels may or may not need a lockd daemon.
+	# We must assume they do, unless we can prove otherwise.
+	# (A false positive here results only in a harmless message.)
+	NEED_LOCKD=yes
+	if test -f /proc/ksyms
+	then
+	    grep -q lockdctl /proc/ksyms || NEED_LOCKD=no
+	fi
+	;;
+
+    *)  # Modern kernels (>= 2.4) start a lockd thread automatically.
+	NEED_LOCKD=no
+	;;
+    esac
     ;;
 esac
 
 # Exit if required binaries are missing.
 [ -x $PREFIX/sbin/rpc.statd ] || exit 0
 [ -x $PREFIX/sbin/rpc.lockd ] || [ "$NEED_LOCKD" = no ] || exit 0
+[ -x /usr/sbin/rpc.idmapd ] || [ "$NEED_IDMAPD" = no ] || exit 0
+[ -x /usr/sbin/rpc.gssd ] || [ "$NEED_GSSD" = no ] || exit 0
+
+do_modprobe() {
+	modprobe -q $1 || true
+}
+
+do_mount() {
+	if ! grep -E -qs "$1\$" /proc/filesystems
+	then
+		return 1
+	fi
+	if ! mountpoint -q $2
+	then
+		mount -t $1 $3 $1 $2
+		return
+	fi
+	return 0
+}
 
 # See how we were called.
 case "$1" in
@@ -53,11 +87,46 @@ case "$1" in
 	    start-stop-daemon --start --quiet \
 		--exec $PREFIX/sbin/rpc.lockd  || true
 	fi
+	if [ "$NEED_IDMAPD" = yes ] || [ "$NEED_GSSD" = yes ]
+	then
+	    do_modprobe nfs
+	    if do_mount rpc_pipefs $PIPEFS_MOUNTPOINT;
+	    then
+	    	if [ "$NEED_IDMAPD" = yes ]
+		then
+		    printf " idmapd"
+		    start-stop-daemon --start --quiet \
+			    --make-pidfile --pidfile $IDMAPD_PIDFILE \
+			    --exec /usr/sbin/rpc.idmapd
+		fi
+		if [ "$NEED_GSSD" = yes ]
+		then
+		    printf " gssd"
+		    start-stop-daemon --start --quiet \
+			    --make-pidfile --pidfile $GSSD_PIDFILE \
+			    --exec /usr/sbin/rpc.gssd -- $RPCGSSDOPTS
+		fi
+	    fi
+	fi
 	echo "."
 	;;
 
   stop)
 	printf "Stopping $DESC:"
+	if [ "$NEED_GSSD" = yes ]
+	then
+	    printf " gssd"
+	    start-stop-daemon --stop --oknodo --quiet \
+		    --name rpc.gssd --user 0
+	    rm -f $GSSD_PIDFILE
+	fi
+	if [ "$NEED_IDMAPD" = yes ]
+	then
+	    printf " idmapd"
+	    start-stop-daemon --stop --oknodo --quiet \
+		--name rpc.idmapd --user 0
+	    rm -f $IDMAPD_PIDFILE
+	fi
 	if [ "$NEED_LOCKD" = yes ]
 	then
 	    printf " lockd"