summaryrefslogtreecommitdiffstats
path: root/recipes-containers/docker/docker_git.bb
diff options
context:
space:
mode:
authorJan Kiszka <jan.kiszka@siemens.com>2017-07-16 16:48:22 +0200
committerBruce Ashfield <bruce.ashfield@windriver.com>2017-09-01 09:29:30 -0400
commit877379ff111931ea71f8ee47452934a6d649d790 (patch)
tree6f3ff05803d66b6245d55a4f9e0af2eefd75acfe /recipes-containers/docker/docker_git.bb
parent1beb18840539f0366b6a5f20bcff98c99534c496 (diff)
downloadmeta-virtualization-877379ff111931ea71f8ee47452934a6d649d790.tar.gz
docker: Fix and update sysvinit script
Fix daemonization, align args with docker.service, fix line breaks in log file - and fix INITSCRIPT_PARAMS (there is no variable OS_DEFAULT_INITSCRIPT_PARAMS). Signed-off-by: Jan Kiszka <jan.kiszka@siemens.com> Signed-off-by: Bruce Ashfield <bruce.ashfield@windriver.com>
Diffstat (limited to 'recipes-containers/docker/docker_git.bb')
-rw-r--r--recipes-containers/docker/docker_git.bb2
1 files changed, 1 insertions, 1 deletions
diff --git a/recipes-containers/docker/docker_git.bb b/recipes-containers/docker/docker_git.bb
index 6ce9fe03..04dc76d0 100644
--- a/recipes-containers/docker/docker_git.bb
+++ b/recipes-containers/docker/docker_git.bb
@@ -122,7 +122,7 @@ SYSTEMD_SERVICE_${PN} = "${@bb.utils.contains('DISTRO_FEATURES','systemd','docke
122 122
123INITSCRIPT_PACKAGES += "${@bb.utils.contains('DISTRO_FEATURES','sysvinit','${PN}','',d)}" 123INITSCRIPT_PACKAGES += "${@bb.utils.contains('DISTRO_FEATURES','sysvinit','${PN}','',d)}"
124INITSCRIPT_NAME_${PN} = "${@bb.utils.contains('DISTRO_FEATURES','sysvinit','docker.init','',d)}" 124INITSCRIPT_NAME_${PN} = "${@bb.utils.contains('DISTRO_FEATURES','sysvinit','docker.init','',d)}"
125INITSCRIPT_PARAMS_${PN} = "${OS_DEFAULT_INITSCRIPT_PARAMS}" 125INITSCRIPT_PARAMS_${PN} = "defaults"
126 126
127do_install() { 127do_install() {
128 mkdir -p ${D}/${bindir} 128 mkdir -p ${D}/${bindir}