Author: baggins Date: Thu Jan 19 10:51:28 2012 GMT Module: packages Tag: HEAD ---- Log message: - rel 4 - its rpc.mountD, rename env var appropriately
---- Files affected: packages/nfs-utils: nfs-utils.spec (1.222 -> 1.223) , nfs.init (1.54 -> 1.55) , nfs.sysconfig (1.12 -> 1.13) ---- Diffs: ================================================================ Index: packages/nfs-utils/nfs-utils.spec diff -u packages/nfs-utils/nfs-utils.spec:1.222 packages/nfs-utils/nfs-utils.spec:1.223 --- packages/nfs-utils/nfs-utils.spec:1.222 Wed Jan 18 23:12:16 2012 +++ packages/nfs-utils/nfs-utils.spec Thu Jan 19 11:51:22 2012 @@ -11,7 +11,7 @@ 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 @@ -421,18 +421,18 @@ %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 @@ -570,6 +570,10 @@ All persons listed below can be reached at <cvs_login>@pld-linux.org $Log$ +Revision 1.223 2012/01/19 10:51:22 baggins +- rel 4 +- its rpc.mountD, rename env var appropriately + Revision 1.222 2012/01/18 22:12:16 baggins - env vars may contain spaces ================================================================ Index: packages/nfs-utils/nfs.init diff -u packages/nfs-utils/nfs.init:1.54 packages/nfs-utils/nfs.init:1.55 --- packages/nfs-utils/nfs.init:1.54 Wed Jan 18 20:25:05 2012 +++ packages/nfs-utils/nfs.init Thu Jan 19 11:51:22 2012 @@ -57,7 +57,7 @@ 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 ================================================================ Index: packages/nfs-utils/nfs.sysconfig diff -u packages/nfs-utils/nfs.sysconfig:1.12 packages/nfs-utils/nfs.sysconfig:1.13 --- packages/nfs-utils/nfs.sysconfig:1.12 Thu Jan 19 11:12:07 2012 +++ packages/nfs-utils/nfs.sysconfig Thu Jan 19 11:51:22 2012 @@ -12,7 +12,7 @@ #RDMA_PORT=20049 # Options for NFS rpc.mountd -#RPCMOUNTOPTIONS= +#RPCMOUNTDOPTIONS= # Options for NFSv4 server-side rpcsec_gss daemon #RPCSVCGSSOPTIONS= ================================================================ ---- CVS-web: http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nfs-utils/nfs-utils.spec?r1=1.222&r2=1.223&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nfs-utils/nfs.init?r1=1.54&r2=1.55&f=u http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/nfs-utils/nfs.sysconfig?r1=1.12&r2=1.13&f=u _______________________________________________ pld-cvs-commit mailing list [email protected] http://lists.pld-linux.org/mailman/listinfo/pld-cvs-commit
