X-Git-Url: https://git.decadent.org.uk/gitweb/?p=nfs-utils.git;a=blobdiff_plain;f=debian%2Fnfs-common.init;h=cd74730f7e2b22f538ed9e25028ed7f930afe669;hp=a9dcb5d510ec94ddc9352c3240d8e48c1c8edc7b;hb=981d25a37fe4a71eddd162672a658da223453985;hpb=8c8a9fb90c606cd8fc852a60727291cf9dea051c

diff --git a/debian/nfs-common.init b/debian/nfs-common.init
index a9dcb5d..cd74730 100755
--- a/debian/nfs-common.init
+++ b/debian/nfs-common.init
@@ -9,52 +9,112 @@
 #	       locking functionality.
 #
 
-PREFIX=
+set -e
+
+# What is this?
+DESC="NFS common utilities"
 
-NEED_LOCKD=yes
-if test -f /proc/ksyms
-then
-    # We need to be conservative and run lockd,
-    # unless we can prove that it isn't required.
-    grep -q lockdctl /proc/ksyms || NEED_LOCKD=no
+# Read config
+DEFAULTFILE=/etc/default/nfs-common
+PREFIX=
+NEED_LOCKD=
+NEED_IDMAPD=yes
+IDMAPD_PIDFILE=/var/run/rpc.idmapd.pid
+PIPEFS_MOUNTPOINT=/var/lib/nfs/rpc_pipefs
+if [ -f $DEFAULTFILE ]; then
+    . $DEFAULTFILE
 fi
 
+# Determine whether lockd daemon is required.
+case "$NEED_LOCKD" in
+yes|no)	;;
+*)  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
 
-# What is this?
-DESC="NFS common utilities"
+do_modprobe() {
+	modprobe -q $1 || true
+}
 
-# Make sure that daemon cwds are in root fs.
-cd /
+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
   start)
+	cd /	# daemons should have root dir as cwd
 	printf "Starting $DESC:"
 	printf " statd"
 	start-stop-daemon --start --quiet \
-	    --exec $PREFIX/sbin/rpc.statd
+	    --exec $PREFIX/sbin/rpc.statd -- $STATDOPTS
 	if [ "$NEED_LOCKD" = yes ]
 	then
 	    printf " lockd"
 	    start-stop-daemon --start --quiet \
-		--exec $PREFIX/sbin/rpc.lockd
+		--exec $PREFIX/sbin/rpc.lockd  || true
+	fi
+	if [ "$NEED_IDMAPD" = yes ]
+	then
+	    do_modprobe nfs
+	    if do_mount rpc_pipefs $PIPEFS_MOUNTPOINT;
+	    then
+		printf " idmapd"
+		start-stop-daemon --start --quiet \
+			--make-pidfile --pidfile $IDMAPD_PIDFILE \
+			--exec /usr/sbin/rpc.idmapd
+	    fi
 	fi
 	echo "."
 	;;
 
   stop)
 	printf "Stopping $DESC:"
+	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"
 	    start-stop-daemon --stop --oknodo --quiet \
-		--name lockd --user root --signal 9
+		--name rpc.lockd --user 0  || true
 	fi
 	printf " statd"
 	start-stop-daemon --stop --oknodo --quiet \
-	    --exec $PREFIX/sbin/rpc.statd
+	    --name rpc.statd --user 0
 	echo "."
 	;;