Re: [PATCH OSSTEST v2 04/11] Force sysvinit with Jessie

[Ian Campbell <ian.campbell@citrix.com>]

On Mon, 2015-06-15 at 14:36 +0100, Wei Liu wrote:
> From: Ian Campbell <ian.campbell@citrix.com>
> 
> Systemd has some issues:
> 
> 1. It doesn't honor osstest-confirm-booted service, which breaks
>    ts-leak-check.
> 2. It kills the ssh connection before 'init 6' has a chance
>    return, which breaks ts-host-reboot.
> 
> Fall back to SysV init for now.
> 
> Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
> [wei: rewrite commit message and code comment]

Those are fine by me, thanks.

> Signed-off-by: Wei Liu <wei.liu2@citrix.com>
> ---
>  Osstest/Debian.pm | 12 ++++++++++++
>  1 file changed, 12 insertions(+)
> 
> diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm
> index c26f88e..fa94210 100644
> --- a/Osstest/Debian.pm
> +++ b/Osstest/Debian.pm
> @@ -903,6 +903,18 @@ in-target update-initramfs -u -k all
>  END
>      }
>  
> +    # Systemd has some issues:
> +    #  1. it doesn't honor osstest-confirm-booted service,
> +    #     which breaks ts-leak-check.
> +    #  2. it kills the ssh connection before 'init 6' has a chance
> +    #     return, which breaks ts-host-reboot.
> +    # Fall back to SysV init for now.
> +    if ( $ho->{Suite} =~ /jessie/ ) {
> +       preseed_hook_command($ho, 'late_command', $sfx, <<END)
> +in-target apt-get install -y sysvinit-core
> +END
> +    }
> +
>      my @extra_packages = ();
>      push(@extra_packages, "u-boot-tools") if $ho->{Flags}{'need-uboot-bootscr'};
>