pool/nfs-utils
SHA256
2
0
Fork 2
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

- nfsserver.init: allow $NFSD_V4_GRACE to set the lease

Browse Source 
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)

OBS-URL: https://build.opensuse.org/package/show/Base:System/nfs-utils?expand=0&rev=132
This commit is contained in:
Neil Brown 2014-09-04 02:58:00 +00:00 committed by Git OBS Bridge
parent 1c7c54a552
commit 0ef7cdb5f5
2 changed files with 21 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
nfs-utils.changes
View File

@ -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 Mon Jul 7 01:57:26 UTC 2014 - nfbrown@suse.com

14
nfsserver.init
View File

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