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

diff --git a/debian/nfs-common.init b/debian/nfs-common.init
index f6c4a8a..eef076d 100755
--- a/debian/nfs-common.init
+++ b/debian/nfs-common.init
@@ -18,26 +18,37 @@ DESC="NFS common utilities"
 DEFAULTFILE=/etc/default/nfs-common
 PREFIX=
 NEED_LOCKD=
+NEED_IDMAPD=yes
 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
 
 # See how we were called.
 case "$1" in
@@ -53,11 +64,23 @@ case "$1" in
 	    start-stop-daemon --start --quiet \
 		--exec $PREFIX/sbin/rpc.lockd  || true
 	fi
+	if [ "$NEED_IDMAPD" = yes ]
+	then
+	    printf " idmapd"
+	    start-stop-daemon --start --quiet \
+		--exec /usr/sbin/rpc.idmapd
+	fi
 	echo "."
 	;;
 
   stop)
 	printf "Stopping $DESC:"
+	if [ "$NEED_IDMAPD" = yes ]
+	then
+	    printf " idmapd"
+	    start-stop-daemon --stop --oknodo --quiet \
+		--name rpc.idmapd --user 0
+	fi
 	if [ "$NEED_LOCKD" = yes ]
 	then
 	    printf " lockd"