From f5abef567ace5b922cd42bf2ca476370c829a62a Mon Sep 17 00:00:00 2001
From: Ian Campbell <ian.campbell@citrix.com>
Date: Fri, 12 Jun 2015 11:24:11 +0100
Subject: [PATCH] Force sysvinit with Jessie

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 <ian.campbell@citrix.com>
[wei: rewrite commit message and code comment]
Signed-off-by: Wei Liu <wei.liu2@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
---
 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, <<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'};
 
-- 
2.39.5