Merge commit 'debian/1.0.7-2'

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

diff --git a/debian/nfs-common.init b/debian/nfs-common.init
index b6fb962e8692b4125c475afe510cc11938e936b6..59fc59df6fecad7429ec9b24a762a5b72675630e 100755 (executable)
--- a/debian/nfs-common.init
+++ b/debian/nfs-common.init
@@ -18,12 +18,6 @@ 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
@@ -52,26 +46,7 @@ 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" "$1" "$2"
-       return
-    fi
-    return 0
-}
+[ -x $PREFIX/sbin/rpc.lockd ] || [ "$NEED_LOCKD" = no ] || exit 0
 
 # See how we were called.
 case "$1" in
@@ -87,46 +62,11 @@ 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"