Imported Debian patch 1.0.7-4

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

diff --git a/debian/nfs-common.init b/debian/nfs-common.init
index c46e832a3c58442b0ff964bff4991bb9aadf76f2..4098d1cad8777fed393a94b760e853547578ce01 100755 (executable)
--- a/debian/nfs-common.init
+++ b/debian/nfs-common.init
@@ -52,25 +52,25 @@ 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
+[ -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
+    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
+    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.
@@ -90,7 +90,7 @@ case "$1" in
        if [ "$NEED_IDMAPD" = yes ] || [ "$NEED_GSSD" = yes ]
        then
            do_modprobe nfs
-           if do_mount rpc_pipefs $PIPEFS_MOUNTPOINT;
+           if do_mount rpc_pipefs $PIPEFS_MOUNTPOINT
            then
                if [ "$NEED_IDMAPD" = yes ]
                then
@@ -117,25 +117,27 @@ case "$1" in
        then
            printf " gssd"
            start-stop-daemon --stop --oknodo --quiet \
-                   --name rpc.gssd --user 0
+                   --name rpc.gssd
            rm -f $GSSD_PIDFILE
        fi
        if [ "$NEED_IDMAPD" = yes ]
        then
            printf " idmapd"
            start-stop-daemon --stop --oknodo --quiet \
-               --name rpc.idmapd --user 0
+               --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
        fi
        printf " statd"
        start-stop-daemon --stop --oknodo --quiet \
-           --name rpc.statd --user 0
+           --name rpc.statd
        echo "."
        ;;