[Xen-devel] [OSSTEST Nested PATCH v10 3/9] Refactor installation of overlays

["longtao.pang" <longtaox.pang@xxxxxxxxx>]

Apply overlay to guests as well as hosts by moving to preseed_base.

We do this because we want to be able to:
       * Use '/etc/init.d/osstest-confirm-booted' for guests as 
         well as hosts (in particular when testing nestedhvm
         we sometimes want to treat a guest as a host).
       * Use grub's 20_linux_xen which is harmless unless Xen is
         installed in the guest which is the case only for
         nestedhvm testing when we want these changes.
The other things in the overlay are some initscripts
(xenbridge and xenlightdaemons) which are not enabled for guests and
hence are therefore harmless.

Signed-off-by: longtao.pang <longtaox.pang@xxxxxxxxx>
---
Based on Ian Campbell's v6_patch [04,05,06], I create this patch
to refactor installation of overlays for guest as well as host used.

Link of Ian Campbell's patch:
http://lists.xenproject.org/archives/html/xen-devel/2015-05/msg00467.html
http://lists.xenproject.org/archives/html/xen-devel/2015-05/msg00452.html
http://lists.xenproject.org/archives/html/xen-devel/2015-05/msg00459.html
---
 Osstest/Debian.pm |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm
index 3baacc4..d65f41c 100644
--- a/Osstest/Debian.pm
+++ b/Osstest/Debian.pm
@@ -630,6 +630,7 @@ sub preseed_base ($$$$;@) {
 
     preseed_ssh($ho, $sfx);
     preseed_hook_overlay($ho, $sfx, $c{OverlayLocal}, 'overlay-local.tar');
+    preseed_hook_overlay($ho, $sfx, 'overlay', 'overlay.tar');
 
     my $preseed = <<"END";
 d-i mirror/suite string $suite
@@ -766,8 +767,6 @@ ls -l /dev/sd*
 true
 END
 
-    preseed_hook_overlay($ho, $sfx, 'overlay', 'overlay.tar');
-
     preseed_hook_command($ho, 'late_command', $sfx, <<END);
 #!/bin/sh
 set -ex
-- 
1.7.10.4


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