diff --git a/docker.changes b/docker.changes index 315effb..d147d91 100644 --- a/docker.changes +++ b/docker.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Mon Aug 3 16:58:07 UTC 2020 - Callum Farmer + +- Fixes for %_libexecdir changing to /usr/libexec (bsc#1174075) + ------------------------------------------------------------------- Tue Jun 30 23:00:00 UTC 2020 - Dominique Leuenberger diff --git a/docker.spec b/docker.spec index 6c6f537..5bd6c64 100644 --- a/docker.spec +++ b/docker.spec @@ -416,6 +416,7 @@ find %{buildroot}%{_prefix}/src/docker \ %if "%flavour" == "kubic" # place kubelet.env in fillupdir (for kubeadm-criconfig) +sed -e 's-@LIBEXECDIR@-%{_libexecdir}-g' -i %{SOURCE5} install -D -m 0644 %{SOURCE5} %{buildroot}%{_fillupdir}/sysconfig.kubelet %endif diff --git a/kubelet.env b/kubelet.env index d790137..ae7b0ee 100644 --- a/kubelet.env +++ b/kubelet.env @@ -1 +1 @@ -KUBELET_EXTRA_ARGS="--cni-bin-dir=/usr/lib/cni" +KUBELET_EXTRA_ARGS="--cni-bin-dir=@LIBEXECDIR@/cni"