]> xenbits.xensource.com Git - people/liuw/osstest.git/commitdiff
ts-debian-install: Honour DebianMirrorProxy, HttpProxy
authorIan Jackson <ian.jackson@eu.citrix.com>
Wed, 25 Mar 2015 16:30:23 +0000 (16:30 +0000)
committerIan Jackson <Ian.Jackson@eu.citrix.com>
Wed, 25 Mar 2015 16:32:28 +0000 (16:32 +0000)
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
ts-debian-install

index fcef82740cab3e4ea21241ba2fd80fc7ff893d99..0dfe40c2bb66f9592916fd0c090fca1f7daac345 100755 (executable)
@@ -76,7 +76,12 @@ sub ginstall () {
             fi
 END
     }
-    target_cmd_root($ho, <<END, 2000);
+    my $cmd = '';
+    my $useproxy = $c{DebianMirrorProxy} // $c{HttpProxy};
+    $cmd .= <<END if defined $useproxy;
+        http_proxy=$useproxy \\
+END
+    $cmd .= <<END;
         xen-create-image \\
             --dhcp --mac $gho->{Ether} \\
             --memory ${ram_mb}Mb --swap ${swap_mb}Mb \\
@@ -89,6 +94,8 @@ END
             $initrd_opt \\
             $archarg
 END
+    target_cmd_root($ho, $cmd, 2000);
+
     my $cfg= "/etc/xen/$gho->{Name}.cfg";
     store_runvar("$gho->{Guest}_cfgpath", $cfg);
     store_runvar("$gho->{Guest}_swap_lv", "$gho->{Name}-swap");