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

diff --cc bin/xen-create-image
index 3b16e7f98d54915f2f0c04b94639af6b1fab7ebb,70ebe9ebebe5edb68dd1827a65e72d19256d04d6..07051a43af69c408089280c984dee33c35c07a35
--- 1/bin/xen-create-image
--- 2/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 8a0a876105822c3f11f64602012ad1aaf88c66fa,a3a1e255423398768714a5a163703dac02c11217..b212f3678f84aafff1496bc3bf8f5f4da65e1541
--- 1/etc/xen-tools.conf
--- 2/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.