merged Bruce
On Fri, Jun 28, 2019 at 8:14 AM Stefan Agner <[email protected]> wrote: > > From: Stefan Agner <[email protected]> > > If docker run --init is used docker expects docker-init to be > present, if not Docker fails to start the container with the > following error: > docker: Error response from daemon: exec: "docker-init": executable file > not found in $PATH. > > However, docker-init does not get deployed by default since commit > d19fda374317 ("docker: consolidate common depends/options"). Readd > docker-init through a PACKAGECONFIG RDEPENDS to make sure it gets > deployed by default again. > > Signed-off-by: Stefan Agner <[email protected]> > --- > 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 168d296..eacaf7f 100644 > --- a/recipes-containers/docker/docker.inc > +++ b/recipes-containers/docker/docker.inc > @@ -32,8 +32,9 @@ RDEPENDS_${PN} += "virtual/containerd virtual/runc" > RRECOMMENDS_${PN} = "kernel-module-dm-thin-pool kernel-module-nf-nat" > > inherit pkgconfig > -PACKAGECONFIG ??= "" > +PACKAGECONFIG ??= "docker-init" > PACKAGECONFIG[seccomp] = "seccomp,,libseccomp" > +PACKAGECONFIG[docker-init] = ",,,docker-init" > > inherit systemd update-rc.d > > -- > 2.13.6 > -- - Thou shalt not follow the NULL pointer, for chaos and madness await thee at its end - "Use the force Harry" - Gandalf, Star Trek II -- _______________________________________________ meta-virtualization mailing list [email protected] https://lists.yoctoproject.org/listinfo/meta-virtualization
