From f75dd6cb23c079f324accba58d6cfe5d95509ef2 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jan=20R=C4=99korajski?= <baggins@pld-linux.org>
Date: Thu, 19 Jan 2012 10:51:22 +0000
Subject: [PATCH] - rel 4 - its rpc.mountD, rename env var appropriately

Changed files:
    nfs-utils.spec -> 1.223
    nfs.init -> 1.55
    nfs.sysconfig -> 1.13
---
 nfs-utils.spec | 12 ++++++------
 nfs.init       |  2 +-
 nfs.sysconfig  |  2 +-
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/nfs-utils.spec b/nfs-utils.spec
index d4f2a96..383a5b1 100644
--- a/nfs-utils.spec
+++ b/nfs-utils.spec
@@ -10,7 +10,7 @@ Summary(ru.UTF-8):	Утилиты для NFS и демоны поддержки
 Summary(uk.UTF-8):	Утиліти для NFS та демони підтримки для NFS-сервера ядра
 Name:		nfs-utils
 Version:	1.2.5
-Release:	3.1
+Release:	4
 License:	GPL v2
 Group:		Networking/Daemons
 #Source0:	http://www.kernel.org/pub/linux/utils/nfs/%{name}-%{version}.tar.bz2
@@ -420,18 +420,18 @@ fi
 %triggerpostun -- %{name} < 1.2.5-4
 if [ -f /etc/sysconfig/nfsd ]; then
 	. /etc/sysconfig/nfsd
-	__RPCMOUNTOPTIONS=
-	[ -n "$MOUNTD_PORT" ] && __RPCMOUNTOPTIONS="-p $MOUNTD_PORT"
+	__RPCMOUNTDOPTIONS=
+	[ -n "$MOUNTD_PORT" ] && __RPCMOUNTDOPTIONS="-p $MOUNTD_PORT"
 	for vers in 2 3 4 ; do
 		__var=$(eval echo \$NFSv$vers)
 		[ -n "$__var" -a "$__var" != "yes" ] && \
-			__RPCMOUNTOPTIONS="$__RPCMOUNTOPTIONS --no-nfs-version $vers"
+			__RPCMOUNTDOPTIONS="$__RPCMOUNTDOPTIONS --no-nfs-version $vers"
 	done
-	[ -z "$__RPCMOUNTOPTIONS" ] && exit 0
+	[ -z "$__RPCMOUNTDOPTIONS" ] && exit 0
 	cp -f /etc/sysconfig/nfsd{,.rpmsave}
 	echo >>/etc/sysconfig/nfsd
 	echo "# Added by rpm trigger" >>/etc/sysconfig/nfsd
-	echo "RPCMOUNTOPTIONS=\"$RPCMOUNTOPTIONS $__RPCMOUNTOPTIONS\"" >>/etc/sysconfig/nfsd
+	echo "RPCMOUNTDOPTIONS=\"$RPCMOUNTOPTIONS $__RPCMOUNTDOPTIONS\"" >>/etc/sysconfig/nfsd
 fi
 
 %triggerpostun common -- %{name}-lock < 1.2.5-3
diff --git a/nfs.init b/nfs.init
index e8ed54a..e3019b2 100644
--- a/nfs.init
+++ b/nfs.init
@@ -57,7 +57,7 @@ start() {
 	msg_starting "NFS exportfs"
 	daemon /usr/sbin/exportfs -r
 	msg_starting "NFS mountd"
-	daemon /usr/sbin/rpc.mountd $RPCMOUNTOPTIONS
+	daemon /usr/sbin/rpc.mountd $RPCMOUNTDOPTIONS
 	msg_starting "NFS daemon"
 	daemon /usr/sbin/rpc.nfsd $RPCNFSDCOUNT
 	touch /var/lock/subsys/nfs
diff --git a/nfs.sysconfig b/nfs.sysconfig
index b6313b8..4744be7 100644
--- a/nfs.sysconfig
+++ b/nfs.sysconfig
@@ -12,7 +12,7 @@ RPCNFSDCOUNT=8
 #RDMA_PORT=20049
 
 # Options for NFS rpc.mountd
-#RPCMOUNTOPTIONS=
+#RPCMOUNTDOPTIONS=
 
 # Options for NFSv4 server-side rpcsec_gss daemon
 #RPCSVCGSSOPTIONS=
-- 
2.44.0