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 cd74730f7e2b22f538ed9e25028ed7f930afe669..59fc59df6fecad7429ec9b24a762a5b72675630e 100755 (executable)
--- a/debian/nfs-common.init
+++ b/debian/nfs-common.init
@@ -18,9 +18,6 @@ DESC="NFS common utilities"
 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,24 +47,6 @@ 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
-
-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
@@ -83,29 +62,11 @@ case "$1" in
            start-stop-daemon --start --quiet \
                --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"