diff --git a/Makefile b/Makefile index af13ec8..0a4cf8c 100644 --- a/Makefile +++ b/Makefile @@ -173,6 +173,7 @@ install-hooks: -cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d lenny.d -cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d squeeze.d -cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d wheezy.d + -cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d jessie.d -cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d sid.d -cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d testing.d -cd ${prefix}/usr/lib/xen-tools/ && ln -s debian.d stable.d @@ -196,6 +197,7 @@ install-hooks: -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 + -cd ${prefix}/usr/lib/xen-tools/ && ln -s karmic.d raring.d cp hooks/common.sh ${prefix}/usr/lib/xen-tools cp -r hooks/common ${prefix}/usr/lib/xen-tools diff --git a/README b/README index 8ac4891..a0e03c9 100644 --- a/README +++ b/README @@ -31,6 +31,7 @@ About: * Lenny 5.0 * Squeeze 6.0 * Wheezy 7.0 + * Jessie 8.0 (preliminary support as it's not yet available) * Sid (works at least at the moment of writing :-) Ubuntu (only DomUs tested): @@ -47,7 +48,8 @@ About: * Natty Narwhal 11.04 * Oneiric Ocelot 11.10 * Precise Pangolin 12.04 - * Quantal Quetzal 12.10 (preliminary support as it's not yet available) + * Quantal Quetzal 12.10 + * Raring Ringtail 13.04 (preliminary support as it's not yet available) CentOS (only DomUs tested, pygrub support incomplete): * CentOS 5 diff --git a/bin/xen-create-image b/bin/xen-create-image index a2d69f1..6826e28 100755 --- a/bin/xen-create-image +++ b/bin/xen-create-image @@ -1309,17 +1309,17 @@ sub setupDefaultOptions $CONFIG{ 'mirror' } = ''; # Initialize per distribution mirror defaults: Debian - foreach my $debdist (qw(squeeze wheezy sid testing oldstable stable unstable)) { + foreach my $debdist (qw(squeeze wheezy jessie sid testing oldstable stable unstable)) { $CONFIG{ 'mirror_'.$debdist } = $CONFIG{ 'mirror' } } foreach my $debdist (qw(sarge etch lenny)) { $CONFIG{ 'mirror_'.$debdist } = 'http://archive.debian.org/debian'; } # Initialize per distribution mirror defaults: Ubuntu - foreach my $ubuntudist (qw(hardy lucid natty oneiric precise quantal)) { + foreach my $ubuntudist (qw(hardy lucid oneiric precise quantal raring)) { $CONFIG{ 'mirror_'.$ubuntudist } = 'http://archive.ubuntu.com/ubuntu'; } - foreach my $ubuntudist (qw(dapper edgy feisty gutsy intrepid jaunty karmic maverick)) { + foreach my $ubuntudist (qw(dapper edgy feisty gutsy intrepid jaunty karmic maverick natty)) { $CONFIG{ 'mirror_'.$ubuntudist } = 'http://old-releases.ubuntu.com/ubuntu'; } $CONFIG{ 'apt_proxy' } = ''; @@ -1874,7 +1874,7 @@ sub checkArguments # # Lucid and probably all later Ubuntus, too, don't work without pygrub # - if ( $CONFIG{ 'dist' } =~ /lucid|maverick|natty|oneiric|precise|quantal/ ) + if ( $CONFIG{ 'dist' } =~ /lucid|maverick|natty|oneiric|precise|quantal|raring/ ) { $CONFIG{ 'pygrub' } = 1; } diff --git a/debian/changelog b/debian/changelog index 0a97b16..0c7034c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,6 +10,7 @@ xen-tools (4.3.1+dev-1) UNRELEASED; urgency=low --memory. (Closes: #691320) Document the recognized units. - Default DomUs to use the noop scheduler (Closes: #693131) - Remove CVS revisions from --version output + - Preliminary support for Debian Jessie and Ubuntu Raring * Add debian/gbp.conf to be able to to build xen-tools with git-buildpackage. * Install (manually generated) upstream ChangeLog only if it diff --git a/etc/xen-tools.conf b/etc/xen-tools.conf index fb867a3..e5faf34 100644 --- a/etc/xen-tools.conf +++ b/etc/xen-tools.conf @@ -266,6 +266,7 @@ mirror = `xt-guess-suite-and-mirror --mirror` # mirror_lenny = http://archive.debian.org/debian # mirror_squeeze = http://cdn.debian.net/debian # mirror_wheezy = http://cdn.debian.net/debian +# mirror_jessie = http://cdn.debian.net/debian # mirror_sid = http://cdn.debian.net/debian # mirror_dapper = http://old-releases.ubuntu.com/ubuntu # mirror_edgy = http://old-releases.ubuntu.com/ubuntu @@ -277,10 +278,11 @@ mirror = `xt-guess-suite-and-mirror --mirror` # mirror_karmic = http://old-releases.ubuntu.com/ubuntu # mirror_lucid = http://archive.ubuntu.com/ubuntu # mirror_maverick = http://old-releases.ubuntu.com/ubuntu -# mirror_natty = http://archive.ubuntu.com/ubuntu +# 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 # If this is defined it will be used by debootstrap, and configured as the # proxy for the guest