From 1ecb68d92b2962633c492df37f1c0018bbc6e732 Mon Sep 17 00:00:00 2001 From: Lokesh Mandvekar Date: Thu, 25 Jul 2024 11:55:34 -0400 Subject: [PATCH] [skip-ci] RPM: podman-iptables.conf only on Fedora RHEL10 defaults to nftables and doesn't need /usr/lib/modules-load.d/podman-iptables.conf so this should be Fedora only. Signed-off-by: Lokesh Mandvekar --- rpm/podman.spec | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/rpm/podman.spec b/rpm/podman.spec index 1de5c74b4b..b93ef3c2cd 100644 --- a/rpm/podman.spec +++ b/rpm/podman.spec @@ -264,9 +264,11 @@ PODMAN_VERSION=%{version} %{__make} DESTDIR=%{buildroot} PREFIX=%{_prefix} ETCDI install.docker \ install.docker-docs \ install.remote \ - install.testing \ -%if %{defined _modulesloaddir} - install.modules-load + install.testing + +# Only need this on Fedora until nftables becomes the default +%if %{defined fedora} +%{__make} DESTDIR=%{buildroot} MODULESLOADDIR=%{_modulesloaddir} install.modules-load %endif sed -i 's;%{buildroot};;g' %{buildroot}%{_bindir}/docker @@ -305,7 +307,7 @@ ln -s ../virtiofsd %{buildroot}%{_libexecdir}/%{name} %{_tmpfilesdir}/%{name}.conf %{_systemdgeneratordir}/%{name}-system-generator %{_systemdusergeneratordir}/%{name}-user-generator -%if %{defined _modulesloaddir} +%if %{defined fedora} %{_modulesloaddir}/%{name}-iptables.conf %endif