- rel 4

- its rpc.mountD, rename env var appropriately

Changed files:
    nfs-utils.spec -> 1.223
    nfs.init -> 1.55
    nfs.sysconfig -> 1.13

diff --git a/nfs-utils.spec b/nfs-utils.spec
index d4f2a9659ea5c2957608018b8b5195b1f83ee24b..383a5b1dc851d754054468846a876cb5efafb4da 100644 (file)
--- 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 e8ed54a90397df9cce41707a8e3de5f71e3e384b..e3019b211b31db5f3cc89e443276b7085488b799 100644 (file)
--- 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 b6313b8783cdf8f58f17e47372af07be9ab8b941..4744be7f0e9ee8a07b155de65af15458bb9cbdfa 100644 (file)
--- 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=