summaryrefslogtreecommitdiffstats
path: root/recipes-containers
diff options
context:
space:
mode:
authorLeon Anavi <leon.anavi@konsulko.com>2021-07-16 18:41:46 +0300
committerBruce Ashfield <bruce.ashfield@gmail.com>2021-07-20 22:51:29 -0400
commitf82d5f11beec5ace7035a6a5a44cf3df584d3939 (patch)
tree09feb0f97798d15106583911a70f5ff1ceacc9b1 /recipes-containers
parente510c748df8390342c1b71980dd3b897bb420519 (diff)
downloadmeta-virtualization-f82d5f11beec5ace7035a6a5a44cf3df584d3939.tar.gz
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 <leon.anavi@konsulko.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@gmail.com>
Diffstat (limited to 'recipes-containers')
-rw-r--r--recipes-containers/docker/docker.inc3
1 files changed, 2 insertions, 1 deletions
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() {
120 # replaces one copied from above with one that uses the local registry for a mirror 120 # replaces one copied from above with one that uses the local registry for a mirror
121 install -m 644 ${S}/src/import/contrib/init/systemd/docker.service ${D}/${systemd_unitdir}/system 121 install -m 644 ${S}/src/import/contrib/init/systemd/docker.service ${D}/${systemd_unitdir}/system
122 rm -f ${D}/${systemd_unitdir}/system/docker.service.rpm 122 rm -f ${D}/${systemd_unitdir}/system/docker.service.rpm
123 else 123 fi
124 if ${@bb.utils.contains('DISTRO_FEATURES','sysvinit','true','false',d)}; then
124 install -d ${D}${sysconfdir}/init.d 125 install -d ${D}${sysconfdir}/init.d
125 install -m 0755 ${WORKDIR}/docker.init ${D}${sysconfdir}/init.d/docker.init 126 install -m 0755 ${WORKDIR}/docker.init ${D}${sysconfdir}/init.d/docker.init
126 fi 127 fi