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

diff --git a/debian/nfs-common.init b/debian/nfs-common.init
index eef076d..cd74730 100755
--- a/debian/nfs-common.init
+++ b/debian/nfs-common.init
@@ -19,6 +19,8 @@ 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
@@ -50,6 +52,23 @@ esac
 [ -x $PREFIX/sbin/rpc.lockd ] || [ "$NEED_LOCKD" = no ] || exit 0
 [ -x /usr/sbin/rpc.idmapd ] || [ "$NEED_IDMAPD" = 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
   start)
@@ -66,9 +85,14 @@ case "$1" in
 	fi
 	if [ "$NEED_IDMAPD" = yes ]
 	then
-	    printf " idmapd"
-	    start-stop-daemon --start --quiet \
-		--exec /usr/sbin/rpc.idmapd
+	    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 "."
 	;;
@@ -80,6 +104,7 @@ case "$1" in
 	    printf " idmapd"
 	    start-stop-daemon --stop --oknodo --quiet \
 		--name rpc.idmapd --user 0
+	    rm -f $IDMAPD_PIDFILE
 	fi
 	if [ "$NEED_LOCKD" = yes ]
 	then