From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ian Campbell <ian.campbell@citrix.com>
Subject: Re: [PATCH OSSTEST v2 04/11] Force sysvinit with Jessie
Date: Mon, 15 Jun 2015 16:40:13 +0100
Message-ID: <1434382813.13744.26.camel@citrix.com>
References: <1434375399-19107-1-git-send-email-wei.liu2@citrix.com>
	<1434375399-19107-5-git-send-email-wei.liu2@citrix.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xen.org>
Received: from mail6.bemta3.messagelabs.com ([195.245.230.39])
	by lists.xen.org with esmtp (Exim 4.72)
	(envelope-from <prvs=601a95058=Ian.Campbell@citrix.com>)
	id 1Z4XR9-0000cd-8N
	for xen-devel@lists.xenproject.org; Mon, 15 Jun 2015 16:40:39 +0000
In-Reply-To: <1434375399-19107-5-git-send-email-wei.liu2@citrix.com>
List-Unsubscribe: <http://lists.xen.org/cgi-bin/mailman/options/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xen.org>
List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help>
List-Subscribe: <http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=subscribe>
Sender: xen-devel-bounces@lists.xen.org
Errors-To: xen-devel-bounces@lists.xen.org
To: Wei Liu <wei.liu2@citrix.com>
Cc: Xen-devel <xen-devel@lists.xenproject.org>, ian.jackson@eu.citrix.com
List-Id: xen-devel@lists.xenproject.org

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'};
>