From e8edaf20d8621a753cd3f59a05dee43f55e996d8 Mon Sep 17 00:00:00 2001 From: Steve Dickson Date: Fri, 2 Jan 2015 08:35:31 -0500 Subject: [PATCH] Change if statments to string comparisons in nfs-utils_env.sh (bz1170353) Signed-off-by: Steve Dickson --- nfs-utils.spec | 5 ++++- nfs-utils_env.sh | 6 +++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/nfs-utils.spec b/nfs-utils.spec index 2e3e617..44be4b5 100644 --- a/nfs-utils.spec +++ b/nfs-utils.spec @@ -2,7 +2,7 @@ Summary: NFS utilities and supporting clients and daemons for the kernel NFS ser Name: nfs-utils URL: http://sourceforge.net/projects/nfs Version: 1.3.1 -Release: 4.0%{?dist} +Release: 4.1%{?dist} Epoch: 1 # group all 32bit related archs @@ -300,6 +300,9 @@ fi /sbin/umount.nfs4 %changelog +* Fri Jan 2 2015 Steve Dickson 1.3.1-4.1 +- Change if statments to string comparisons in nfs-utils_env.sh (bz 1170354) + * Sat Dec 13 2014 Steve Dickson 1.3.1-4.0 - Updated to latest upstream RC release: nfs-utils-1-3-2-rc4 (bz 1164477) - Handle the rpcuser like other created users (bz 1165322) diff --git a/nfs-utils_env.sh b/nfs-utils_env.sh index 8f4dd10..ef55733 100644 --- a/nfs-utils_env.sh +++ b/nfs-utils_env.sh @@ -18,15 +18,15 @@ if [ -n "$LOCKD_TCPPORT" -o -n "$LOCKD_UDPPORT" ]; then /sbin/sysctl -w fs.nfs.nlm_udpport=$LOCKD_UDPPORT >/dev/null 2>&1 fi -if [ "$NFSD_V4_GRACE" -gt 0 ]; then +if [ -n "$NFSD_V4_GRACE" ]; then grace="-G $NFSD_V4_GRACE" fi -if [ "$NFSD_V4_LEASE" -gt 0 ]; then +if [ -n "$NFSD_V4_LEASE" ]; then lease="-L $NFSD_V4_LEASE" fi -if [ "$RPCNFSDCOUNT" -gt 0 ]; then +if [ -n "$RPCNFSDCOUNT" ]; then nfsds=$RPCNFSDCOUNT else nfsds=8