$gsuite was set from guest_var, but before $gho was set, leading to an
undefined value warning from Perl.
This would ignore any guest-specific suite runvars. AFAICT these are
set by some of the jobs in make-distros-flight. I think the effect of
this change is to apply workarounds for the intended suite, rather
than for wheezy.
(Although there is another assignment to $gho later in
ts-debian-hvm-install, for stage 2, the stage 2 code does some trivial
TestSupport calls and does not need $gsuite. So there is no need to
make arrangements to assign to $gsuite - or, for that matter, $kernel
or $ramdisk, in that path.)
Signed-off-by: Ian Jackson <ian.jack...@eu.citrix.com>
---
ts-debian-hvm-install | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/ts-debian-hvm-install b/ts-debian-hvm-install
index 71ab1a5..fb07293 100755
--- a/ts-debian-hvm-install
+++ b/ts-debian-hvm-install
@@ -50,7 +50,7 @@ our $gho;
our ($kernel, $ramdisk);
-our $gsuite= guest_var($gho,'suite',$c{GuestDebianSuite});
+our $gsuite;
sub preseed () {
@@ -187,6 +187,7 @@ sub prep () {
$disk_mb + 1,
200);
+ $gsuite = guest_var($gho,'suite',$c{GuestDebianSuite});
$kernel = iso_path('kernel', 'vmlinuz');
$ramdisk = iso_path('ramdisk', 'initrd.gz');
--
1.7.10.4
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
