Dominique Leuenberger 2020-08-06 15:30:11 +00:00 committed by Git OBS Bridge
parent 7d97891f7c
commit c972e7bba2
3 changed files with 7 additions and 1 deletions

View File

@ -241,7 +241,7 @@ init_path = "/usr/bin/catatonit"
# Path to directory where CNI plugin binaries are located.
#
cni_plugin_dirs = ["/usr/lib/cni"]
cni_plugin_dirs = ["@LIBEXECDIR@/cni"]
# Path to the directory where CNI configuration files are located.
#

View File

@ -1,3 +1,8 @@
-------------------------------------------------------------------
Mon Aug 3 17:10:46 UTC 2020 - Callum Farmer <callumjfarmer13@gmail.com>
- Fixes for %_libexecdir changing to /usr/libexec (bsc#1174075)
-------------------------------------------------------------------
Tue Jul 28 13:22:02 UTC 2020 - Ralf Haferkamp <rhafer@suse.com>

View File

@ -111,6 +111,7 @@ install -D -m 0644 %{SOURCE5} %{buildroot}/%{_datadir}/containers/mounts.conf
install -D -m 0644 %{SOURCE5} %{buildroot}/%{_sysconfdir}/containers/mounts.conf
install -D -m 0644 %{SOURCE6} %{buildroot}/%{_sysconfdir}/containers/registries.conf
install -D -m 0644 %{SOURCE8} %{buildroot}/%{_sysconfdir}/containers/registries.d/default.yaml
sed -e 's-@LIBEXECDIR@-%{_libexecdir}-g' -i %{SOURCE10}
install -D -m 0644 %{SOURCE10} %{buildroot}/%{_datadir}/containers/containers.conf
install -D -m 0644 podman-%{podmanver}/seccomp.json %{buildroot}/%{_datadir}/containers/seccomp.json
install -D -m 0644 podman-%{podmanver}/seccomp.json %{buildroot}/%{_sysconfdir}/containers/seccomp.json