Merge branch '4.2' of gitorious.org:xen-tools/xen-tools into 4.2

Conflicts:
	debian/changelog

Makefile

@@ -190,6 +190,7 @@ install-hooks:
 	-cd ${prefix}/usr/lib/xen-tools/ && ln -s karmic.d natty.d
 	-cd ${prefix}/usr/lib/xen-tools/ && ln -s karmic.d oneiric.d
 	-cd ${prefix}/usr/lib/xen-tools/ && ln -s karmic.d precise.d
+	-cd ${prefix}/usr/lib/xen-tools/ && ln -s karmic.d quantal.d
 	cp hooks/common.sh ${prefix}/usr/lib/xen-tools
 
 

bin/xen-create-image

@@ -1358,10 +1358,10 @@ sub setupDefaultOptions
         $CONFIG{ 'mirror_'.$debdist } = 'http://archive.debian.org/debian';
     }
     # Initialize per distribution mirror defaults: Ubuntu
-    foreach my $ubuntudist (qw(dapper hardy lucid maverick natty oneiric precise)) {
+    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 jaunty karmic)) {
+    foreach my $ubuntudist (qw(edgy feisty gutsy intrepid jaunty karmic maverick)) {
         $CONFIG{ 'mirror_'.$ubuntudist } = 'http://old-releases.ubuntu.com/ubuntu';
     }
     $CONFIG{ 'arch' }          = '';
@@ -1913,7 +1913,7 @@ sub checkArguments
     #
     #  Lucid and probably all later Ubuntus, too, don't work without pygrub
     #
-    if ( $CONFIG{ 'dist' } =~ /lucid|maverick|natty|oneiric|precise/ )
+    if ( $CONFIG{ 'dist' } =~ /lucid|maverick|natty|oneiric|precise|quantal/ )
     {
         $CONFIG{ 'pygrub' } = 1;
     }

debian/changelog

@@ -4,7 +4,7 @@ xen-tools (4.2.1+dev-1) UNRELEASED; urgency=low
     - Correctly checks and documents valid values for
       disk_device. (Closes: #621499)
     - Supports creating Ubuntu 11.10 Oneiric DomUs (LP: #848654)
-    - Supports creating Ubuntu 12.04 Precise DomUs
+    - Supports creating Ubuntu 12.04 Precise and 12.10 Quantal DomUs
     - Updated mirror list for discontinued releases of Debian and Ubuntu
     - Workaround for missing unit parsing in xen-create-nfs (Closes:
       #648814)

etc/xen-tools.conf

@@ -280,6 +280,7 @@ mirror = `xt-guess-suite-and-mirror --mirror`
 # 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
 
 
 #