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 #23402 from lsm5/iptables-modules-load 

[skip-ci] RPM: podman-iptables.conf only on Fedora
This commit is contained in:
openshift-merge-bot[bot] 2024-07-26 08:21:23 +00:00 committed by GitHub
parent a3e9a2af4b 1ecb68d92b
commit ea7500099a
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
rpm/podman.spec
View File

@ -264,9 +264,11 @@ PODMAN_VERSION=%{version} %{__make} DESTDIR=%{buildroot} PREFIX=%{_prefix} ETCDI
install.docker \ install.docker \
install.docker-docs \ install.docker-docs \
install.remote \ install.remote \
install.testing \ install.testing
%if %{defined _modulesloaddir}
install.modules-load # Only need this on Fedora until nftables becomes the default
%if %{defined fedora}
%{__make} DESTDIR=%{buildroot} MODULESLOADDIR=%{_modulesloaddir} install.modules-load
%endif %endif
sed -i 's;%{buildroot};;g' %{buildroot}%{_bindir}/docker sed -i 's;%{buildroot};;g' %{buildroot}%{_bindir}/docker
@ -305,7 +307,7 @@ 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 _modulesloaddir} %if %{defined fedora}
%{_modulesloaddir}/%{name}-iptables.conf %{_modulesloaddir}/%{name}-iptables.conf
%endif %endif