From 0c894eec48a16ca5965d634cf71186b7b12d6ca6 Mon Sep 17 00:00:00 2001 From: Axel Beckert Date: Sat, 17 May 2014 12:07:33 +0200 Subject: [PATCH] Update list of supported Ubuntu releases Preliminary support for Ubuntu 14.10 Utopic Unicorn --- Makefile | 1 + README.markdown | 3 ++- bin/xen-create-image | 4 ++-- debian/changelog | 2 ++ debian/control | 3 ++- etc/xen-tools.conf | 5 +++-- 6 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Makefile b/Makefile index 32819b4..99580a6 100644 --- a/Makefile +++ b/Makefile @@ -203,6 +203,7 @@ install-hooks: -cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d raring.d -cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d saucy.d -cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d trusty.d + -cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d utopic.d cp hooks/common.sh ${prefix}/usr/share/xen-tools cp -r hooks/common ${prefix}/usr/share/xen-tools diff --git a/README.markdown b/README.markdown index 8868933..d43d31d 100644 --- a/README.markdown +++ b/README.markdown @@ -56,7 +56,8 @@ known to work reliably, i.e.: * Quantal Quetzal 12.10 * Raring Ringtail 13.04 * Saucy Salamander 13.10 -* Trusty Tahr 14.04 (LTS, under development) +* Trusty Tahr 14.04 (LTS) +* Utopic Unicorn 14.10 (under development) [1]: http://bugs.debian.org/659360 "debootstrap in Wheezy can no more build Ubuntu Edgy or earlier" diff --git a/bin/xen-create-image b/bin/xen-create-image index 7b6d46a..a3f9d08 100755 --- a/bin/xen-create-image +++ b/bin/xen-create-image @@ -1252,10 +1252,10 @@ sub setupDefaultOptions $CONFIG{ 'mirror_'.$debdist } = 'http://http.debian.net/debian-archive/debian'; } # Initialize per distribution mirror defaults: Ubuntu - foreach my $ubuntudist (qw(lucid precise quantal raring saucy trusty)) { + foreach my $ubuntudist (qw(lucid precise saucy trusty utopic)) { $CONFIG{ 'mirror_'.$ubuntudist } = 'http://archive.ubuntu.com/ubuntu'; } - foreach my $ubuntudist (qw(dapper edgy feisty gutsy hardy intrepid jaunty karmic maverick natty oneiric)) { + foreach my $ubuntudist (qw(dapper edgy feisty gutsy hardy intrepid jaunty karmic maverick natty oneiric quantal raring)) { $CONFIG{ 'mirror_'.$ubuntudist } = 'http://old-releases.ubuntu.com/ubuntu'; } $CONFIG{ 'apt_proxy' } = ''; diff --git a/debian/changelog b/debian/changelog index 5ce0859..30d33c7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,8 @@ xen-tools (4.4+dev-1) UNRELEASED; urgency=low /usr/share/xen-tools/*.d/ with hooks in /etc/xen-tools/hooks.d/. Thanks! (Also add /etc/xen-tools/hooks.d/ to debian/dirs.) * Ignore cover_db directory in t/perl-syntax.t. + * Update list of supported Ubuntu releases. Preliminary support for + Ubuntu 14.10 Utopic Unicorn. -- Axel Beckert Sun, 15 Dec 2013 17:20:43 +0100 diff --git a/debian/control b/debian/control index 254b3ef..5c4b9bd 100644 --- a/debian/control +++ b/debian/control @@ -75,6 +75,7 @@ Description: Tools to manage Xen virtual servers * Ubuntu 12.10 Quantal Quetzal * Ubuntu 13.04 Raring Ringtail * Ubuntu 13.10 Saucy Salamander - * Ubuntu 14.04 Trusty Tahr (LTS, under development) + * Ubuntu 14.04 Trusty Tahr (LTS) + * Ubuntu 14.10 Utopic Unicorn (under development) * CentOS 5 * CentOS 6 diff --git a/etc/xen-tools.conf b/etc/xen-tools.conf index cf036a4..d57ba5f 100644 --- a/etc/xen-tools.conf +++ b/etc/xen-tools.conf @@ -290,10 +290,11 @@ mirror = `xt-guess-suite-and-mirror --mirror` # mirror_natty = http://old-releases.ubuntu.com/ubuntu # mirror_oneiric = http://archive.ubuntu.com/ubuntu # mirror_precise = http://archive.ubuntu.com/ubuntu -# mirror_quantal = http://archive.ubuntu.com/ubuntu -# mirror_raring = http://archive.ubuntu.com/ubuntu +# mirror_quantal = http://old-releases.ubuntu.com/ubuntu +# mirror_raring = http://old-releases.ubuntu.com/ubuntu # mirror_saucy = http://archive.ubuntu.com/ubuntu # mirror_trusty = http://archive.ubuntu.com/ubuntu +# mirror_utopic = http://archive.ubuntu.com/ubuntu # If this is defined it will be used by debootstrap, and configured as the # proxy for the guest