From d8561d4b7df0ca98117ce81b425b0e3a4ba3373b Mon Sep 17 00:00:00 2001 From: Axel Beckert Date: Tue, 24 Apr 2012 19:51:01 +0200 Subject: [PATCH] Preliminary support for Ubuntu 12.10 Quantal Quetzal --- Makefile | 1 + bin/xen-create-image | 6 +++--- debian/changelog | 2 +- etc/xen-tools.conf | 1 + 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/Makefile b/Makefile index 528130a..0feebd8 100644 --- a/Makefile +++ b/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 diff --git a/bin/xen-create-image b/bin/xen-create-image index 016b7d5..d3ae6d7 100755 --- a/bin/xen-create-image +++ b/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; } diff --git a/debian/changelog b/debian/changelog index 838907c..20c7805 100644 --- a/debian/changelog +++ b/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) * Support creating Ubuntu 11.10 Oneiric DomUs (LP: #848654) - * Support creating Ubuntu 12.04 Precise DomUs + * Support creating Ubuntu 12.04 Precise and 12.10 Quantal DomUs * Update mirror list for discontinued releases of Debian and Ubuntu * No more suggest evms-cli -- it's no more available on any supported Dom0 distribution. Thanks to Markus Waldeck for the hint. diff --git a/etc/xen-tools.conf b/etc/xen-tools.conf index 47abfe0..8a0a876 100644 --- a/etc/xen-tools.conf +++ b/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 #