From 4c2fe78df1f29e538d985d59a36eb1904d0064d992a42853207d44aea7e05c84 Mon Sep 17 00:00:00 2001
From: Neil Brown <nfbrown@suse.com>
Date: Tue, 9 Aug 2016 23:33:41 +0000
Subject: [PATCH] - nfs-utils_env.sh   Fix some problems with version_params.  
 Various misspellings and remove the possiblity   that V4 is both disabled and
 enabled.   (bsc#990356)

OBS-URL: https://build.opensuse.org/package/show/Base:System/nfs-utils?expand=0&rev=166
---
 nfs-utils.changes |  9 +++++++++
 nfs-utils_env.sh  | 10 +++++-----
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/nfs-utils.changes b/nfs-utils.changes
index f5f3d04..02de4f3 100644
--- a/nfs-utils.changes
+++ b/nfs-utils.changes
@@ -1,3 +1,12 @@
+-------------------------------------------------------------------
+Tue Aug  9 23:32:10 UTC 2016 - nfbrown@suse.com
+
+- nfs-utils_env.sh
+  Fix some problems with version_params.
+  Various misspellings and remove the possiblity
+  that V4 is both disabled and enabled.
+  (bsc#990356)
+
 -------------------------------------------------------------------
 Mon Aug  8 08:39:54 UTC 2016 - tchvatal@suse.com
 
diff --git a/nfs-utils_env.sh b/nfs-utils_env.sh
index af59868..18ac375 100644
--- a/nfs-utils_env.sh
+++ b/nfs-utils_env.sh
@@ -33,11 +33,11 @@ if [ "$NFS3_SERVER_SUPPORT" == "no" ]; then
 fi
 if [ "$NFS4_SUPPORT" != "yes" ]; then
    version_params="--no-nfs-version 4"
+else
+   if [ "$NFS4_SERVER_MINOR_VERSION" != "0" ]; then
+      version_params="$version_params --nfs-version 4 --nfs-version 4.$NFS4_SERVER_MINOR_VERSION"
+   fi
 fi
-if [ "$NFS4_SERVER_MINOR_VERSION" != "0" ]; then
-   version_params="$VERSION_PARAMS --nfs-version 4 --nfs-version 4.$NFS4_SERVER_MINOR_VERSION"
-fi
-
 if [ "$USE_KERNEL_NFSD_NUMBER" -gt 0 ]; then
     threads=$USE_KERNEL_NFSD_NUMBER
 else
@@ -71,7 +71,7 @@ esac
 mkdir -p /run/sysconfig
 {
 echo "RPCIDMAPDARGS=$pipefs"
-echo "RPCMOUNTDARGS=$mountdport $MOUNTD_OPTIONS $version_parms"
+echo "RPCMOUNTDARGS=$mountdport $MOUNTD_OPTIONS $version_params"
 echo "RPCNFSDARGS=$NFSD_OPTIONS $version_params $time_params $threads"
 echo "GSSDARGS=$ignore_dns $GSSD_OPTIONS $pipefs"
 echo "SMNOTIFYARGS=$SM_NOTIFY_OPTIONS"