Skip to content

Commit

Permalink
Merge pull request #24109 from Luap99/rpm-iptables-fedora
Browse files Browse the repository at this point in the history
rpm: do not load iptables modules on f41+
  • Loading branch information
openshift-merge-bot[bot] authored Oct 1, 2024
2 parents e40b28f + b5e1863 commit ded7833
Showing 1 changed file with 6 additions and 3 deletions.
9 changes: 6 additions & 3 deletions rpm/podman.spec
Original file line number Diff line number Diff line change
Expand Up @@ -266,8 +266,8 @@ PODMAN_VERSION=%{version} %{__make} DESTDIR=%{buildroot} PREFIX=%{_prefix} ETCDI
install.remote \
install.testing

# Only need this on Fedora until nftables becomes the default
%if %{defined fedora}
# See above for the iptables.conf declaration
%if %{defined fedora} && 0%{?fedora} < 41
%{__make} DESTDIR=%{buildroot} MODULESLOADDIR=%{_modulesloaddir} install.modules-load
%endif

Expand Down Expand Up @@ -307,7 +307,10 @@ ln -s ../virtiofsd %{buildroot}%{_libexecdir}/%{name}
%{_tmpfilesdir}/%{name}.conf
%{_systemdgeneratordir}/%{name}-system-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
%endif

Expand Down

1 comment on commit ded7833

@packit-as-a-service
Copy link

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

podman-next COPR build failed. @containers/packit-build please check.

Please sign in to comment.