From f82d5f11beec5ace7035a6a5a44cf3df584d3939 Mon Sep 17 00:00:00 2001 From: Leon Anavi Date: Fri, 16 Jul 2021 18:41:46 +0300 Subject: docker: Fix for sysvinit Fix for rare legacy systems which still use simultaneously both sysvinit and systemd in DISTRO_FEATURES. This fix avoids issues during do_rootfs with postinstall scriptlets of ['docker-ce']. Signed-off-by: Leon Anavi Signed-off-by: Bruce Ashfield --- recipes-containers/docker/docker.inc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/recipes-containers/docker/docker.inc b/recipes-containers/docker/docker.inc index cd4d27b9..610da568 100644 --- a/recipes-containers/docker/docker.inc +++ b/recipes-containers/docker/docker.inc @@ -120,7 +120,8 @@ do_install() { # replaces one copied from above with one that uses the local registry for a mirror install -m 644 ${S}/src/import/contrib/init/systemd/docker.service ${D}/${systemd_unitdir}/system rm -f ${D}/${systemd_unitdir}/system/docker.service.rpm - else + fi + if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then install -d ${D}${sysconfdir}/init.d install -m 0755 ${WORKDIR}/docker.init ${D}${sysconfdir}/init.d/docker.init fi -- cgit v1.2.3-54-g00ecf