Merged update from upstream sources
This is an automated DistroBaker update from upstream sources. If you do not know what this is about or would like to opt out, contact the OSCI team. Source: https://src.fedoraproject.org/rpms/nfs-utils.git#56aa42541981fc94866058c8f588dd29e556bdda
This commit is contained in:
DistroBaker
parent
991b1d8a5e
commit
48754f91f3
|
|
@ -0,0 +1,9 @@
|
|||
[ NFSMount_Global_Options ]
|
||||
# This statically named section defines global mount
|
||||
# options that can be applied on all NFS mount.
|
||||
#
|
||||
# Setting this option makes it mandatory the server supports the
|
||||
# given version. The mount will fail if the given version is
|
||||
# not support by the server.
|
||||
Nfsvers=4
|
||||
|
||||
|
|
@ -0,0 +1,16 @@
|
|||
diff -up nfs-utils-2.5.3/nfs.conf.orig nfs-utils-2.5.3/nfs.conf
|
||||
--- nfs-utils-2.5.3/nfs.conf.orig 2021-03-16 13:38:43.922161313 -0400
|
||||
+++ nfs-utils-2.5.3/nfs.conf 2021-03-16 13:39:24.560299448 -0400
|
||||
@@ -72,9 +72,9 @@ use-gss-proxy=1
|
||||
# vers4.0=y
|
||||
# vers4.1=y
|
||||
# vers4.2=y
|
||||
-# rdma=n
|
||||
-# rdma-port=20049
|
||||
-#
|
||||
+rdma=y
|
||||
+rdma-port=20049
|
||||
+
|
||||
[statd]
|
||||
# debug=0
|
||||
# port=0
|
||||
File diff suppressed because it is too large
Load Diff
102
nfs-utils.spec
102
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://linux-nfs.org/
|
||||
Version: 2.5.3
|
||||
Release: 0%{?dist}
|
||||
Release: 2.rc1%{?dist}
|
||||
Epoch: 1
|
||||
|
||||
# group all 32bit related archs
|
||||
|
|
@ -15,6 +15,10 @@ Source3: 24-nfs-server.conf
|
|||
Source4: nfsconvert.py
|
||||
Source5: nfsconvert.sh
|
||||
Source6: nfs-convert.service
|
||||
Source7: 10-nfsv4.conf
|
||||
|
||||
Patch001: nfs-utils-2.5.4-rc1.patch
|
||||
Patch002: nfs-utils-2.5.3-rdma-on.patch
|
||||
|
||||
Patch100: nfs-utils-1.2.1-statdpath-man.patch
|
||||
Patch101: nfs-utils-1.2.1-exp-subtree-warn-off.patch
|
||||
|
|
@ -80,6 +84,28 @@ Requires: rpcbind
|
|||
%description -n nfs-utils-coreos
|
||||
Minimal NFS utilities for supporting clients
|
||||
|
||||
%package -n nfs-stats-utils
|
||||
Summary: NFS utilities for supporting clients
|
||||
Provides: nfsstat = %{epoch}:%{version}-%{release}
|
||||
Provides: mountstats = %{epoch}:%{version}-%{release}
|
||||
Provides: nfsiostat = %{epoch}:%{version}-%{release}
|
||||
|
||||
%description -n nfs-stats-utils
|
||||
Show NFS client Statistics
|
||||
|
||||
%package -n nfsv4-client-utils
|
||||
Summary: NFSv4 utilities for supporting client
|
||||
Provides: rpc.gssd = %{epoch}:%{version}-%{release}
|
||||
Provides: mount.nfs = %{epoch}:%{version}-%{release}
|
||||
Provides: mount.nfs4 = %{epoch}:%{version}-%{release}
|
||||
Provides: umount.nfs = %{epoch}:%{version}-%{release}
|
||||
Provides: umount.nfs4 = %{epoch}:%{version}-%{release}
|
||||
Provides: nfsidmap = %{epoch}:%{version}-%{release}
|
||||
Requires: gssproxy => 0.7.0-3
|
||||
|
||||
%description -n nfsv4-client-utils
|
||||
The nfsv4-client-utils packages provided NFSv4 client support
|
||||
|
||||
%package -n libnfsidmap
|
||||
Summary: NFSv4 User and Group ID Mapping Library
|
||||
Provides: libnfsidmap%{?_isa} = %{epoch}:%{version}-%{release}
|
||||
|
|
@ -182,6 +208,9 @@ mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/nfs/statd/sm.bak
|
|||
mkdir -p $RPM_BUILD_ROOT%{_sharedstatedir}/nfs/v4recovery
|
||||
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/exports.d
|
||||
|
||||
mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/nfsmount.conf.d
|
||||
install -m 644 %{SOURCE7} $RPM_BUILD_ROOT%{_sysconfdir}/nfsmount.conf.d
|
||||
|
||||
|
||||
%pre
|
||||
# move files so the running service will have this applied as well
|
||||
|
|
@ -240,6 +269,13 @@ fi
|
|||
|
||||
%systemd_post nfs-server
|
||||
|
||||
%post -n nfsv4-client-utils
|
||||
if [ $1 -eq 1 ] ; then
|
||||
# Initial installation
|
||||
/bin/systemctl enable nfs-client.target >/dev/null 2>&1 || :
|
||||
/bin/systemctl start nfs-client.target >/dev/null 2>&1 || :
|
||||
fi
|
||||
|
||||
%preun
|
||||
if [ $1 -eq 0 ]; then
|
||||
%systemd_preun nfs-client.target
|
||||
|
|
@ -249,10 +285,21 @@ if [ $1 -eq 0 ]; then
|
|||
rm -rf /var/lib/nfs/v4recovery
|
||||
fi
|
||||
|
||||
%preun -n nfsv4-client-utils
|
||||
if [ $1 -eq 0 ]; then
|
||||
%systemd_preun nfs-client.target
|
||||
|
||||
rm -rf /etc/nfsmount.conf.d
|
||||
rm -rf /var/lib/nfs/v4recovery
|
||||
fi
|
||||
|
||||
%postun
|
||||
%systemd_postun_with_restart nfs-client.target
|
||||
%systemd_postun_with_restart nfs-server
|
||||
|
||||
%postun -n nfsv4-client-utils
|
||||
%systemd_postun_with_restart nfs-client.target
|
||||
|
||||
/bin/systemctl --system daemon-reload >/dev/null 2>&1 || :
|
||||
|
||||
%triggerin -- nfs-utils > 1:2.1.1-3
|
||||
|
|
@ -363,7 +410,60 @@ fi
|
|||
%{_pkgdir}/*/rpc_pipefs.target
|
||||
%{_pkgdir}/*/var-lib-nfs-rpc_pipefs.mount
|
||||
|
||||
%files -n nfsv4-client-utils
|
||||
%config(noreplace) /etc/nfsmount.conf
|
||||
%dir %{_sharedstatedir}/nfs/v4recovery
|
||||
%dir %attr(555, root, root) %{_sharedstatedir}/nfs/rpc_pipefs
|
||||
%dir %{_libexecdir}/nfs-utils
|
||||
%config(noreplace) %{_sysconfdir}/request-key.d/id_resolver.conf
|
||||
%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/gssproxy/24-nfs-server.conf
|
||||
%attr(0600,root,root) %config(noreplace) %{_sysconfdir}/nfsmount.conf.d/10-nfsv4.conf
|
||||
%{_sbindir}/rpc.gssd
|
||||
%{_sbindir}/nfsidmap
|
||||
%{_sbindir}/nfsconvert
|
||||
%{_sbindir}/nfsstat
|
||||
%attr(755,root,root) %{_libexecdir}/nfs-utils/nfsconvert.sh
|
||||
%attr(4755,root,root) /sbin/mount.nfs
|
||||
/sbin/mount.nfs4
|
||||
/sbin/umount.nfs
|
||||
/sbin/umount.nfs4
|
||||
%{_mandir}/*/nfs.5.gz
|
||||
%{_mandir}/*/nfs.conf.5.gz
|
||||
%{_mandir}/*/nfsmount.conf.5.gz
|
||||
%{_mandir}/*/gssd.8.gz
|
||||
%{_mandir}/*/mount.nfs.8.gz
|
||||
%{_mandir}/*/nfsconf.8.gz
|
||||
%{_mandir}/*/nfsidmap.8.gz
|
||||
%{_mandir}/*/rpc.gssd.8.gz
|
||||
%{_mandir}/*/mount.nfs.8.gz
|
||||
%{_mandir}/*/umount.nfs.8.gz
|
||||
%{_mandir}/*/nfsidmap.8.gz
|
||||
%{_mandir}/*/nfsstat.8.gz
|
||||
%{_pkgdir}/*/rpc-pipefs-generator
|
||||
%{_pkgdir}/*/auth-rpcgss-module.service
|
||||
%{_pkgdir}/*/nfs-client.target
|
||||
%{_pkgdir}/*/nfs-convert.service
|
||||
%{_pkgdir}/*/rpc-gssd.service
|
||||
%{_pkgdir}/*/rpc_pipefs.target
|
||||
%{_pkgdir}/*/var-lib-nfs-rpc_pipefs.mount
|
||||
|
||||
%files -n nfs-stats-utils
|
||||
%{_sbindir}/mountstats
|
||||
%{_sbindir}/nfsiostat
|
||||
%{_mandir}/*/mountstats.8.gz
|
||||
%{_mandir}/*/nfsiostat.8.gz
|
||||
|
||||
%changelog
|
||||
* Tue Mar 16 2021 Steve Dickson <steved@redhat.com> 2.5.3-3.rc1
|
||||
- Enable NFS server RDMA by default (bz 1931565)
|
||||
|
||||
* Mon Mar 15 2021 Steve Dickson <steved@redhat.com> 2.5.3-2.rc1
|
||||
- Updated to the latest RC release: nfs-utils-2-5-4-rc1 (bz 1939257)
|
||||
|
||||
* Sat Mar 13 2021 Steve Dickson <steved@redhat.com> 2.5.3-1
|
||||
- Created a V4 only client package
|
||||
- Broke out the stat cmds using python into a separate package
|
||||
|
||||
* Sun Feb 21 2021 Steve Dickson <steved@redhat.com> 2.5.3-0
|
||||
- Updated to latest upstream release: nfs-utils-2-5-3 (bz 1931101)
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue