diff options
| author | openshift-merge-bot[bot] <148852131+openshift-merge-bot[bot]@users.noreply.github.com> | 2024-10-01 10:17:27 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-10-01 10:17:27 +0000 |
| commit | ded7833255342d52efa9c9f82012435d8171315d (patch) | |
| tree | 3386490832662e6e61d8423ffcdf7183d894e0df | |
| parent | e40b28fdb2040022f5288fd8ea14a5961b88f1bd (diff) | |
| parent | b5e1863d1ca48a89c7936abb94403ffb7ff296a0 (diff) | |
Merge pull request #24109 from Luap99/rpm-iptables-fedora
rpm: do not load iptables modules on f41+
| -rw-r--r-- | rpm/podman.spec | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/rpm/podman.spec b/rpm/podman.spec index 6b3cee152..2d9b299e2 100644 --- a/rpm/podman.spec +++ b/rpm/podman.spec @@ -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 @@ -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 |