containers
/
automation-tests
mirror of https://github.com/containers/automation-tests.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #24109 from Luap99/rpm-iptables-fedora 

rpm: do not load iptables modules on f41+
This commit is contained in:
openshift-merge-bot[bot] 2024-10-01 10:17:27 +00:00 committed by GitHub
parent e40b28fdb2 b5e1863d1c
commit ded7833255
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
rpm/podman.spec
View File

@ -266,8 +266,8 @@ PODMAN_VERSION=%{version} %{__make} DESTDIR=%{buildroot} PREFIX=%{_prefix} ETCDI
install.remote \ install.remote \
install.testing install.testing
# Only need this on Fedora until nftables becomes the default # See above for the iptables.conf declaration
%if %{defined fedora} %if %{defined fedora} && 0%{?fedora} < 41
%{__make} DESTDIR=%{buildroot} MODULESLOADDIR=%{_modulesloaddir} install.modules-load %{__make} DESTDIR=%{buildroot} MODULESLOADDIR=%{_modulesloaddir} install.modules-load
%endif %endif
@ -307,7 +307,10 @@ ln -s ../virtiofsd %{buildroot}%{_libexecdir}/%{name}
%{_tmpfilesdir}/%{name}.conf %{_tmpfilesdir}/%{name}.conf
%{_systemdgeneratordir}/%{name}-system-generator %{_systemdgeneratordir}/%{name}-system-generator
%{_systemdusergeneratordir}/%{name}-user-generator %{_systemdusergeneratordir}/%{name}-user-generator
%if %{defined fedora} # iptables modules are only needed with iptables-legacy,
# as of f41 netavark will default to nftables so do not load unessary modules
# https://fedoraproject.org/wiki/Changes/NetavarkNftablesDefault
%if %{defined fedora} && 0%{?fedora} < 41
%{_modulesloaddir}/%{name}-iptables.conf %{_modulesloaddir}/%{name}-iptables.conf
%endif %endif