[Xen-devel] [PATCH OSSTEST v2 04/11] Force sysvinit with Jessie

[Wei Liu <wei.liu2@xxxxxxxxxx>]

From: Ian Campbell <ian.campbell@xxxxxxxxxx>

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@xxxxxxxxxx>
[wei: rewrite commit message and code comment]
Signed-off-by: Wei Liu <wei.liu2@xxxxxxxxxx>
---
 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'};
 
-- 
1.9.1


_______________________________________________
Xen-devel mailing list
Xen-devel@xxxxxxxxxxxxx
http://lists.xen.org/xen-devel