From: Ian Jackson <ian.jackson@eu.citrix.com>
Date: Tue, 24 Mar 2015 18:50:14 +0000 (+0000)
Subject: Debian mirrors: Support proxy, and default to ftp.debian.org if specified
X-Git-Tag: wip.libvirt-v3-base~271
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=bf2b666b8eef3d60a5fb11293af4624627016b9f;p=people%2Fliuw%2Fosstest.git

Debian mirrors: Support proxy, and default to ftp.debian.org if specified

Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>
---

diff --git a/Osstest.pm b/Osstest.pm
index 22dbc8b..aaaaf7a 100644
--- a/Osstest.pm
+++ b/Osstest.pm
@@ -76,6 +76,7 @@ our %c = qw(
 
 $c{$_}='' foreach qw(
     DebianPreseed
+    DebianMirrorProxy
     TftpPxeTemplatesReal
 );
 
@@ -186,6 +187,8 @@ sub readglobalconfig () {
     $c{GuestDebianSuite} ||= $c{DebianSuite};
 
     $c{DefaultBranch} ||= 'xen-unstable';
+
+    $c{DebianMirrorHost} ||= 'ftp.debian.org' if $c{DebianMirrorProxy};
 }
 
 sub augmentconfigdefaults {
diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm
index 7633b51..f419f22 100644
--- a/Osstest/Debian.pm
+++ b/Osstest/Debian.pm
@@ -562,6 +562,7 @@ d-i finish-install/reboot_in_progress note
 d-i cdrom-detect/eject boolean false
 
 d-i mirror/http/hostname string $c{DebianMirrorHost}
+d-i mirror/http/proxy string $c{DebianMirrorProxy}
 d-i mirror/http/directory string /$c{DebianMirrorSubpath}
 d-i apt-setup/use_mirror boolean yes
 d-i apt-setup/another boolean false
diff --git a/README b/README
index e780762..9634185 100644
--- a/README
+++ b/README
@@ -291,7 +291,12 @@ NetNameservers
 DebianMirrorHost
    Domain name or address of the Debian mirror to use.
    Set DebianMirrorSubpath to the path inside the mirror if
-   your mirror isn't at http://<DebianMirrorHost>/debian/
+   your mirror isn't at http://<DebianMirrorHost>/debian/ .
+   Defaults to ftp.debian.org if DebianMirrorProxy is set.
+
+DebianMirrorProxy
+   The apt proxy to specify for Debian (and derivatives),
+   eg http://apt-cacher:3142/ .
 
 TestHost <hostname>
 TestHost_<ident> <hostname>