From bf6b9f6466d658da3a06557153201353a592258410cd1af58e17ac9a487f6028 Mon Sep 17 00:00:00 2001 From: Neil Brown Date: Wed, 2 May 2012 01:43:09 +0000 Subject: [PATCH] - nfsserver.init: remove VERSION_LIST. This is unnecessary duplication of VERSION_PARAMS OBS-URL: https://build.opensuse.org/package/show/Base:System/nfs-utils?expand=0&rev=71 --- nfs-utils.changes | 6 ++++++ nfsserver.init | 13 ++----------- 2 files changed, 8 insertions(+), 11 deletions(-) diff --git a/nfs-utils.changes b/nfs-utils.changes index 1a5ae79..b0de27d 100644 --- a/nfs-utils.changes +++ b/nfs-utils.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Wed May 2 01:42:23 UTC 2012 - nfbrown@suse.com + +- nfsserver.init: remove VERSION_LIST. This is + unnecessary duplication of VERSION_PARAMS + ------------------------------------------------------------------- Wed May 2 01:34:51 UTC 2012 - nfbrown@suse.com diff --git a/nfsserver.init b/nfsserver.init index d0d4914..f107dd6 100644 --- a/nfsserver.init +++ b/nfsserver.init @@ -175,21 +175,12 @@ case "$1" in rc_status fi VERSION_PARAMS= - if [ "$NFS3_SERVER_SUPPORT" != "no" ]; then - VERSION_LIST="+2 +3 " - else - VERSION_LIST="-2 -3" + if [ "$NFS3_SERVER_SUPPORT" == "no" ]; then VERSION_PARAMS="--no-nfs-version 2 --no-nfs-version 3" fi - if [ "$NFS4_SUPPORT" = "yes" ]; then - VERSION_LIST="$VERSION_LIST +4" - else - VERSION_LIST="$VERSION_LIST -4" + if [ "$NFS4_SUPPORT" != "yes" ]; then VERSION_PARAMS="--no-nfs-version 4" fi - if [ " `cat /proc/fs/nfsd/threads`" = " 0" ]; then - echo $VERSION_LIST > /proc/fs/nfsd/versions - fi if [ -n "$NFSV4LEASETIME" -a -f /proc/fs/nfsd/nfsv4leasetime ]; then echo "$NFSV4LEASETIME" > /proc/fs/nfsd/nfsv4leasetime fi