Imported Debian patch 1.0.7-17

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

diff --git a/debian/nfs-common.init b/debian/nfs-common.init
index b6fb962e8692b4125c475afe510cc11938e936b6..df5fca289018993800860d35a89e9a8c446dfcae 100755 (executable)
--- a/debian/nfs-common.init
+++ b/debian/nfs-common.init
@@ -18,9 +18,9 @@ DESC="NFS common utilities"
 DEFAULTFILE=/etc/default/nfs-common
 PREFIX=
 NEED_LOCKD=
-NEED_IDMAPD=yes
+NEED_IDMAPD=
 IDMAPD_PIDFILE=/var/run/rpc.idmapd.pid
-NEED_GSSD=yes
+NEED_GSSD=
 GSSD_PIDFILE=/var/run/rpc.gssd.pid
 PIPEFS_MOUNTPOINT=/var/lib/nfs/rpc_pipefs
 RPCGSSDOPTS=
@@ -50,6 +50,46 @@ yes|no)      ;;
     ;;
 esac
 
+#
+# Parse the fstab file, and determine whether we need idmapd and gssd. (The
+# /etc/defaults settings, if any, will override our autodetection.) This code
+# is partially adapted from the mountnfs.sh script in the sysvinit package.
+#
+AUTO_NEED_IDMAPD=no
+AUTO_NEED_GSSD=no
+
+exec 9<&0 </etc/fstab
+
+while read DEV MTPT FSTYPE OPTS REST
+do
+    if [ "$FSTYPE" = "nfs4" ]; then
+        AUTO_NEED_IDMAPD=yes
+    fi
+    case "$OPTS" in
+        sec=krb5|*,sec=krb5|sec=krb5,*|*,sec=krb5i,*|sec=krb5i|*,sec=krb5i|sec=krb5i,*|*,sec=krb5i,*|sec=krb5p|*,sec=krb5p|sec=krb5p,*|*,sec=krb5p,*)
+           AUTO_NEED_GSSD=yes
+       ;;
+    esac
+done
+
+exec 0<&9 9<&-
+
+case "$NEED_IDMAPD" in
+    yes|no)    
+        ;;
+    *)
+        NEED_IDMAPD=$AUTO_NEED_IDMAPD
+       ;;
+esac
+
+case "$NEED_GSSD" in
+    yes|no)    
+        ;;
+    *)
+        NEED_GSSD=$AUTO_NEED_GSSD
+       ;;
+esac
+
 # Exit if required binaries are missing.
 [ -x $PREFIX/sbin/rpc.statd ] || exit 0
 [ -x $PREFIX/sbin/rpc.lockd ] || [ "$NEED_LOCKD"  = no ] || exit 0
@@ -73,6 +113,14 @@ do_mount() {
     return 0
 }
 
+do_umount() {
+    if mountpoint -q "$1"
+    then
+       umount "$1"
+    fi
+    return 0
+}
+
 # See how we were called.
 case "$1" in
   start)
@@ -90,6 +138,7 @@ case "$1" in
        if [ "$NEED_IDMAPD" = yes ] || [ "$NEED_GSSD" = yes ]
        then
            do_modprobe nfs
+           do_modprobe nfs4
            if do_mount rpc_pipefs $PIPEFS_MOUNTPOINT
            then
                if [ "$NEED_IDMAPD" = yes ]
@@ -101,6 +150,7 @@ case "$1" in
                fi
                if [ "$NEED_GSSD" = yes ]
                then
+                   do_modprobe rpcsec_gss_krb5
                    printf " gssd"
                    start-stop-daemon --start --quiet \
                            --make-pidfile --pidfile $GSSD_PIDFILE \
@@ -117,25 +167,28 @@ 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 || true
        fi
        printf " statd"
        start-stop-daemon --stop --oknodo --quiet \
-           --name rpc.statd --user 0
+           --name rpc.statd
+       do_umount $PIPEFS_MOUNTPOINT 2>/dev/null || true
        echo "."
        ;;