From: Axel Beckert <abe@deuxchevaux.org>
Date: Mon, 7 May 2012 22:30:36 +0000 (+0200)
Subject: Merge commit 'refs/merge-requests/2' of git://gitorious.org/xen-tools/xen-tools into... 
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=9c90c93bc914beb36ca6a185c8a89c4075f9af6d;p=people%2Fdariof%2Fxen-tools.git

Merge commit 'refs/merge-requests/2' of git://gitorious.org/xen-tools/xen-tools into merge-requests/2
---

9c90c93bc914beb36ca6a185c8a89c4075f9af6d
diff --cc bin/xen-create-image
index 3b16e7f,70ebe9e..07051a4
--- a/bin/xen-create-image
+++ b/bin/xen-create-image
@@@ -1358,12 -1362,13 +1362,13 @@@ sub setupDefaultOption
          $CONFIG{ 'mirror_'.$debdist } = 'http://archive.debian.org/debian';
      }
      # Initialize per distribution mirror defaults: Ubuntu
 -    foreach my $ubuntudist (qw(dapper hardy jaunty karmic lucid maverick natty)) {
 +    foreach my $ubuntudist (qw(dapper hardy lucid natty oneiric precise quantal)) {
          $CONFIG{ 'mirror_'.$ubuntudist } = 'http://archive.ubuntu.com/ubuntu';
      }
 -    foreach my $ubuntudist (qw(edgy feisty gutsy intrepid)) {
 +    foreach my $ubuntudist (qw(edgy feisty gutsy intrepid jaunty karmic maverick)) {
          $CONFIG{ 'mirror_'.$ubuntudist } = 'http://old-releases.ubuntu.com/ubuntu';
      }
+     $CONFIG{ 'apt_proxy' }     = '';
      $CONFIG{ 'arch' }          = '';
      $CONFIG{ 'fs' }            = 'ext3';
      $CONFIG{ 'force' }         = 0;
diff --cc etc/xen-tools.conf
index 8a0a876,a3a1e25..b212f36
--- a/etc/xen-tools.conf
+++ b/etc/xen-tools.conf
@@@ -278,10 -277,11 +278,14 @@@ mirror = `xt-guess-suite-and-mirror --m
  # mirror_lucid = http://archive.ubuntu.com/ubuntu
  # mirror_maverick = http://archive.ubuntu.com/ubuntu
  # mirror_natty = http://archive.ubuntu.com/ubuntu
 +# mirror_oneiric = http://archive.ubuntu.com/ubuntu
 +# mirror_precise = http://archive.ubuntu.com/ubuntu
 +# mirror_quantal = http://archive.ubuntu.com/ubuntu
  
+ # If this is defined it will be used by debootstrap, and configured as the
+ # proxy for the guest
+ #
+ # apt_proxy =
  
  #
  #  Filesystem options for the different filesystems we support.