[Xen-devel] [PATCH OSSTEST] Debian: Move sysvinit-core install from preseed_create to preseed_base

[Ian Campbell <ian.campbell@xxxxxxxxxx>]

preseed_create is used only for physical host installs, but we want
this workaround to apply to at least ts-debian-hvm-install'd guests
which are going to be used for nested testing.

I can't see any harm in doing this globally for all Debian HVM guests,
as well as PV guests installed using Debian Installer.

Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---
 Osstest/Debian.pm | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm
index cee0d88..464f190 100644
--- a/Osstest/Debian.pm
+++ b/Osstest/Debian.pm
@@ -799,6 +799,14 @@ sub preseed_base ($$$$;@) {
 
     $xopts{ExtraPreseed} ||= '';
 
+    # Systemd doesn't honor osstest-confirm-booted service, which
+    # breaks ts-leak-check.  Fall back to SysV init for now.
+    if ( $suite =~ /jessie/ ) {
+       preseed_hook_command($ho, 'late_command', $sfx, <<END)
+in-target apt-get install -y sysvinit-core
+END
+    }
+
     preseed_ssh($ho, $sfx);
 
     preseed_hook_command($ho, 'late_command', '', <<'END');
@@ -1178,14 +1186,6 @@ 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.6.1


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