From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Liu Subject: [PATCH OSSTEST v3 04/11] Force sysvinit with Jessie Date: Wed, 17 Jun 2015 14:06:37 +0100 Message-ID: <1434546404-2036-5-git-send-email-wei.liu2@citrix.com> References: <1434546404-2036-1-git-send-email-wei.liu2@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5D3k-0005BA-UK for xen-devel@lists.xenproject.org; Wed, 17 Jun 2015 13:07:17 +0000 In-Reply-To: <1434546404-2036-1-git-send-email-wei.liu2@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Xen-devel Cc: Wei Liu , ian.jackson@eu.citrix.com, Ian Campbell List-Id: xen-devel@lists.xenproject.org From: Ian Campbell Systemd doesn't honor osstest-confirm-booted service, which breaks ts-leak-check. Fall back to SysV init for now. Signed-off-by: Ian Campbell [wei: rewrite commit message and code comment] Signed-off-by: Wei Liu Acked-by: Ian Jackson --- Osstest/Debian.pm | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm index 26363af..905758f 100644 --- a/Osstest/Debian.pm +++ b/Osstest/Debian.pm @@ -945,6 +945,14 @@ in-target update-initramfs -u -k all END } + # Systemd doesn't honor osstest-confirm-booted service, which + # breaks ts-leak-check. Fall back to SysV init for now. + if ( $ho->{Suite} =~ /jessie/ ) { + preseed_hook_command($ho, 'late_command', $sfx, <{Flags}{'need-uboot-bootscr'}; -- 1.9.1