ts-windows-install: Honour memsize and disksize guest runvars

Signed-off-by: Ian Jackson <Ian.Jackson@eu.citrix.com>
CC: Wei Liu <wei.liu2@citrix.com>
Reviewed-by: Paul Durrant <paul.durrant@citrix.com>

diff --git a/ts-windows-install b/ts-windows-install
index 5ee127dda21cbc2e711f5dd24fd2eb69abdfccf4..4dc8f2a6c480f8c363cb2ffd5bc6890fce0f1bec 100755 (executable)
--- a/ts-windows-install
+++ b/ts-windows-install
@@ -27,17 +27,19 @@ our ($whhost) = @ARGV;
 $whhost ||= 'host';
 our $ho= selecthost($whhost);
 
+our $gn = 'win';
 our $gho;
 
-our $ram_mb=   1536;
-our $disk_mb= 32000;
-
 our $guesthost= 'win.guest.osstest';
 
 sub prep () {
     target_install_packages_norec($ho, qw(lvm2 rsync));
 
-    $gho= prepareguest($ho, 'win', $guesthost, 8936,
+    my $ghot = guest_template($gn);
+    my $ram_mb = guest_var($ghot, 'memsize', 1536);
+    my $disk_mb = guest_var($ghot, 'disksize', 32000);
+
+    $gho= prepareguest($ho, $gn, $guesthost, 8936,
                        $disk_mb + 1,
                        300);