Imported Debian patch 1.0.9-8

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

diff --git a/debian/nfs-common.init b/debian/nfs-common.init
index 5c34c9e7ae1fae9b72216e5cc9e907ddde7a34b0..a93097661f64d772b8b38052d1040cdd5d03a67f 100644 (file)
--- a/debian/nfs-common.init
+++ b/debian/nfs-common.init
@@ -19,9 +19,7 @@ DEFAULTFILE=/etc/default/nfs-common
 PREFIX=
 NEED_LOCKD=
 NEED_IDMAPD=
-IDMAPD_PIDFILE=/var/run/rpc.idmapd.pid
 NEED_GSSD=
-GSSD_PIDFILE=/var/run/rpc.gssd.pid
 PIPEFS_MOUNTPOINT=/var/lib/nfs/rpc_pipefs
 RPCGSSDOPTS=
 if [ -f $DEFAULTFILE ]; then
@@ -76,6 +74,20 @@ done
 
 exec 0<&9 9<&-
 
+#
+# We also need idmapd if we run an NFSv4 server. It's fairly difficult
+# to autodetect whether there are NFSv4 exports or not, and idmapd is not a
+# particularily heavy daemon, so we auto-enable it if we find an /etc/exports
+# file. This does not mean that there are NFSv4 or other mounts active (or
+# even that nfs-kernel-server is installed), but it matches what the "start"
+# condition in nfs-kernel-server's init script does, which has a value in
+# itself.
+#
+if [ -f /etc/exports ]; then
+    AUTO_NEED_IDMAPD=yes
+fi
+
+
 case "$NEED_IDMAPD" in
     yes|no)    
         ;;
@@ -156,7 +168,6 @@ case "$1" in
                then
                    log_progress_msg "idmapd"
                    start-stop-daemon --start --oknodo --quiet \
-                           --make-pidfile --pidfile $IDMAPD_PIDFILE \
                            --exec /usr/sbin/rpc.idmapd
                    if [ $? != 0 ]; then
                        log_end_msg $?
@@ -168,7 +179,6 @@ case "$1" in
                    do_modprobe rpcsec_gss_krb5
                    log_progress_msg "gssd"
                    start-stop-daemon --start --oknodo --quiet \
-                           --make-pidfile --pidfile $GSSD_PIDFILE \
                            --exec /usr/sbin/rpc.gssd -- $RPCGSSDOPTS
                    if [ $? != 0 ]; then
                        log_end_msg $?
@@ -192,7 +202,6 @@ case "$1" in
                 log_end_msg $?
                 exit $?
             fi
-           rm -f $GSSD_PIDFILE
        fi
        if [ "$NEED_IDMAPD" = yes ]
        then
@@ -203,7 +212,6 @@ case "$1" in
                 log_end_msg $?
                 exit $?
             fi
-           rm -f $IDMAPD_PIDFILE
        fi
        if [ "$NEED_LOCKD" = yes ]
        then
@@ -237,7 +245,7 @@ case "$1" in
 
        if [ "$NEED_GSSD" = yes ]
        then
-            if [ ! -f "$GSSD_PIDFILE" ] || ! pidof rpc.gssd >/dev/null
+            if ! pidof rpc.gssd >/dev/null
            then
                echo "rpc.statd running, but rpc.gssd halted"
                exit 3
@@ -255,7 +263,7 @@ case "$1" in
            
        if [ "$NEED_IDMAPD" = yes ]
        then
-            if [ ! -f "$IDMAPD_PIDFILE" ] || ! pidof rpc.idmapd >/dev/null
+            if ! pidof rpc.idmapd >/dev/null
            then
                echo "rpc.statd running, but rpc.idmapd halted"
                exit 3