From cfa30f06b63bb65dfed5af49f0e24158423f671f Mon Sep 17 00:00:00 2001 From: Axel Beckert Date: Wed, 23 Oct 2013 13:54:45 +0200 Subject: [PATCH] Preliminary support for Ubuntu 14.04 Trusty Tahr --- Makefile | 1 + bin/xen-create-image | 2 +- debian/changelog | 1 + etc/xen-tools.conf | 1 + 4 files changed, 4 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 6eb81cc..9a400d7 100644 --- a/Makefile +++ b/Makefile @@ -202,6 +202,7 @@ install-hooks: -cd ${prefix}/usr/share/xen-tools/ && ln -s karmic.d quantal.d -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 cp hooks/common.sh ${prefix}/usr/share/xen-tools cp -r hooks/common ${prefix}/usr/share/xen-tools diff --git a/bin/xen-create-image b/bin/xen-create-image index bc9b978..7fc486b 100755 --- a/bin/xen-create-image +++ b/bin/xen-create-image @@ -1336,7 +1336,7 @@ 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)) { + foreach my $ubuntudist (qw(lucid precise quantal raring saucy trusty)) { $CONFIG{ 'mirror_'.$ubuntudist } = 'http://archive.ubuntu.com/ubuntu'; } foreach my $ubuntudist (qw(dapper edgy feisty gutsy hardy intrepid jaunty karmic maverick natty oneiric)) { diff --git a/debian/changelog b/debian/changelog index 13f1d2e..0b58635 100644 --- a/debian/changelog +++ b/debian/changelog @@ -21,6 +21,7 @@ xen-tools (4.4~dev-1) UNRELEASED; urgency=low * Reformat hooks/common/40-setup-networking-deb so that the result neither has trailing whitespace nor broken indentation. * Also display MAC address after the DomU has been created. + * Preliminary support for Ubuntu 14.04 Trusty Tahr. -- Axel Beckert Fri, 23 Aug 2013 21:13:07 +0200 diff --git a/etc/xen-tools.conf b/etc/xen-tools.conf index b934996..44861cc 100644 --- a/etc/xen-tools.conf +++ b/etc/xen-tools.conf @@ -292,6 +292,7 @@ mirror = `xt-guess-suite-and-mirror --mirror` # mirror_quantal = http://archive.ubuntu.com/ubuntu # mirror_raring = http://archive.ubuntu.com/ubuntu # mirror_saucy = http://archive.ubuntu.com/ubuntu +# mirror_trusty = http://archive.ubuntu.com/ubuntu # If this is defined it will be used by debootstrap, and configured as the # proxy for the guest