Re: [meta-virtualization][PATCH 1/3] docker: Fix for sysvinit

["Bruce Ashfield" <bruce.ashfield@gmail.com>]

merged!

Bruce

In message: [meta-virtualization][PATCH 1/3] docker: Fix for sysvinit
on 16/07/2021 Leon Anavi wrote:

> 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>
> ---
>  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 cd4d27b..610da56 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
> -- 
> 2.17.1
> 

> 
> 
>