From: Jacob Stiffler <[email protected]>

The docker recipe in meta-virtualization has conflicting logic for
when to install and when to enable the docker initscript. When both
systemd and sysvinit are in DISTRO_FEATURES, this causes the docker
postinst to fail, which now fails the rootfs task.

Here we install the initscript only based on if sysvinit is in the
DISTRO_FEATURES.

Signed-off-by: Jacob Stiffler <[email protected]>
Signed-off-by: Denys Dmytriyenko <[email protected]>
---
 meta-arago-distro/recipes-containers/docker/docker_git.bbappend | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 
meta-arago-distro/recipes-containers/docker/docker_git.bbappend

diff --git a/meta-arago-distro/recipes-containers/docker/docker_git.bbappend 
b/meta-arago-distro/recipes-containers/docker/docker_git.bbappend
new file mode 100644
index 0000000..ccf9ff2
--- /dev/null
+++ b/meta-arago-distro/recipes-containers/docker/docker_git.bbappend
@@ -0,0 +1,8 @@
+PR_append = ".arago0"
+
+do_install_append() {
+       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
+}
-- 
2.7.4

_______________________________________________
meta-arago mailing list
[email protected]
http://arago-project.org/cgi-bin/mailman/listinfo/meta-arago

Reply via email to