Accepting request 248431 from Base:System

Automatic submission by obs-autosubmit

OBS-URL: https://build.opensuse.org/request/show/248431
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/nfs-utils?expand=0&rev=121

nfs-utils.changes

@@ -1,3 +1,13 @@
+-------------------------------------------------------------------
+Thu Sep  4 02:55:22 UTC 2014 - nfbrown@suse.com
+
+- nfsserver.init: allow $NFSD_V4_GRACE to set the lease
+  time if NFSV4LEASETIME is not set, as some documentation
+  suggests this.
+  Also set NFSv4 and NLM grace time to make the NFSv4 lease time
+  as having them different at boot time doesn't make sense.
+  (bnc#892809)
+
 -------------------------------------------------------------------
 Mon Jul  7 01:57:26 UTC 2014 - nfbrown@suse.com
 

nfsserver.init

@@ -93,6 +93,11 @@ case "$NFS4_SERVER_MINOR_VERSION" in
     * ) NFS4_SERVER_MINOR_VERSION=0
 esac
 
+if [ -n "$NFSV4LEASETIME" ] ; then
+    # Documentation inconsistency.
+    NFSV4LEASETIME=$NFSD_V4_GRACE
+fi
+
 check_for_nfsdfs() {
     HAVE_NFSDFS="no"
     while read dummy type ; do
@@ -213,9 +218,12 @@ case "$1" in
       if [ "$NFS4_SERVER_MINOR_VERSION" != "0" ]; then
        VERSION_PARAMS="$VERSION_PARAMS --nfs-version 4 --nfs-version 4.$NFS4_SERVER_MINOR_VERSION"
       fi
-      if [ -n "$NFSV4LEASETIME" -a -f /proc/fs/nfsd/nfsv4leasetime ]; then
+      for fl in /proc/fs/nfsd/nfsv4leasetime /proc/fs/nfsd/nfsv4gracetime /proc/sys/fs/nfs/nlm_grace_period
-        echo "$NFSV4LEASETIME" > /proc/fs/nfsd/nfsv4leasetime
+      do
+          if [ -n "$NFSV4LEASETIME" -a -f $fl ]; then
+            echo "$NFSV4LEASETIME" > $fl
           fi
+      done
 
       nfs4_bind_mounts
       # svcgssd; gssd; idmapd