misc debian fixed from trond

diff --git a/debian/nfs-common.init b/debian/nfs-common.init
index eef076db947f1ca6ad1fd1aced1e140446b6561a..cd74730f7e2b22f538ed9e25028ed7f930afe669 100755 (executable)
--- 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

diff --git a/debian/nfs-kernel-server.init b/debian/nfs-kernel-server.init
index e80026777b279646d84654fd3bfa06f3bb3caf62..d500ebcae56679cfd17f37159ddb66873d0c1e11 100755 (executable)
--- a/debian/nfs-kernel-server.init
+++ b/debian/nfs-kernel-server.init
@@ -25,21 +25,36 @@ PREFIX=/usr
 DEFAULTFILE=/etc/default/nfs-kernel-server
 RPCNFSDCOUNT=8
 RPCMOUNTDOPTS=
+PROCNFSD_MOUNTPOINT=/proc/fs/nfsd
 if [ -f $DEFAULTFILE ]; then
     . $DEFAULTFILE
 fi
 
+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)
        cd /    # daemons should have root dir as cwd
        if grep -q '^/' /etc/exports
        then
-               # Having the 'nfsd' filesystem mounted (if available)
-               # make client authentication more reliable.
-               if [ -d /proc/fs/nfsd -a ! -f /proc/fs/nfsd/exports ]
-               then mount -t nfsd nfsd /proc/fs/nfsd
-               fi
+               do_modprobe nfsd
+               do_mount nfsd $PROCNFSD_MOUNTPOINT || true
                printf "Exporting directories for $DESC..."
                $PREFIX/sbin/exportfs -r
                echo "done."
@@ -85,7 +100,6 @@ case "$1" in
 
        printf "Unexporting directories for $DESC..."
        $PREFIX/sbin/exportfs -au
-       if [ -f /proc/fs/nfsd/exports ] ; then umount /proc/fs/nfsd; fi
        echo "done."
        ;;