Imported Debian patch 1.0.7-5

[nfs-utils.git] / debian / nfs-common.init

diff --git a/debian/nfs-common.init b/debian/nfs-common.init
index 59fc59df6fecad7429ec9b24a762a5b72675630e..0f25166a3fa91fb31b9a47b4e4f1658fdbccea76 100755 (executable)
--- a/debian/nfs-common.init
+++ b/debian/nfs-common.init
@@ -18,6 +18,12 @@ 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
@@ -46,7 +52,26 @@ 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 $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" "$1" "$2"
+       return
+    fi
+    return 0
+}
 
 # See how we were called.
 case "$1" in
@@ -62,20 +87,57 @@ 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
+           rm -f $GSSD_PIDFILE
+       fi
+       if [ "$NEED_IDMAPD" = yes ]
+       then
+           printf " idmapd"
+           start-stop-daemon --stop --oknodo --quiet \
+               --name rpc.idmapd
+           rm -f $IDMAPD_PIDFILE
+       fi
        if [ "$NEED_LOCKD" = yes ]
        then
            printf " lockd"
            start-stop-daemon --stop --oknodo --quiet \
-               --name rpc.lockd --user 0  || true
+               --name rpc.lockd || true
+       else
+           pkill -KILL -u root -x lockd || true
        fi
        printf " statd"
        start-stop-daemon --stop --oknodo --quiet \
-           --name rpc.statd --user 0
+           --name rpc.statd
        echo "."
        ;;