diff --git a/Makefile b/Makefile index a8abc20..528130a 100644 --- a/Makefile +++ b/Makefile @@ -189,6 +189,7 @@ install-hooks: -cd ${prefix}/usr/lib/xen-tools/ && ln -s karmic.d maverick.d -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 cp hooks/common.sh ${prefix}/usr/lib/xen-tools diff --git a/bin/xen-create-image b/bin/xen-create-image index 85317d6..016b7d5 100755 --- a/bin/xen-create-image +++ b/bin/xen-create-image @@ -1351,17 +1351,17 @@ sub setupDefaultOptions $CONFIG{ 'mirror' } = ''; # Initialize per distribution mirror defaults: Debian - foreach my $debdist (qw(lenny squeeze wheezy sid testing stable unstable)) { + foreach my $debdist (qw(squeeze wheezy sid testing oldstable stable unstable)) { $CONFIG{ 'mirror_'.$debdist } = $CONFIG{ 'mirror' } } - foreach my $debdist (qw(sarge etch)) { + 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(dapper hardy jaunty karmic lucid maverick natty oneiric)) { + foreach my $ubuntudist (qw(dapper hardy lucid maverick natty oneiric precise)) { $CONFIG{ 'mirror_'.$ubuntudist } = 'http://archive.ubuntu.com/ubuntu'; } - foreach my $ubuntudist (qw(edgy feisty gutsy intrepid)) { + foreach my $ubuntudist (qw(edgy feisty gutsy intrepid jaunty karmic)) { $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/ ) + if ( $CONFIG{ 'dist' } =~ /lucid|maverick|natty|oneiric|precise/ ) { $CONFIG{ 'pygrub' } = 1; } diff --git a/debian/changelog b/debian/changelog index 59b383c..99afcf4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,6 +4,8 @@ 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 + * Update mirror list for discontinued releases of Debian and Ubuntu * Workaround for missing unit parsing in xen-create-nfs (Closes: #648814) * Fix wildcard vs regexp in memory configuration parsing. diff --git a/etc/xen-tools.conf b/etc/xen-tools.conf index ea72da8..47abfe0 100644 --- a/etc/xen-tools.conf +++ b/etc/xen-tools.conf @@ -263,7 +263,7 @@ mirror = `xt-guess-suite-and-mirror --mirror` # # mirror_sarge = http://archive.debian.org/debian # mirror_etch = http://archive.debian.org/debian -# mirror_lenny = http://cdn.debian.net/debian +# mirror_lenny = http://archive.debian.org/debian # mirror_squeeze = http://cdn.debian.net/debian # mirror_wheezy = http://cdn.debian.net/debian # mirror_sid = http://cdn.debian.net/debian @@ -273,11 +273,13 @@ mirror = `xt-guess-suite-and-mirror --mirror` # mirror_gutsy = http://old-releases.ubuntu.com/ubuntu # mirror_hardy = http://archive.ubuntu.com/ubuntu # mirror_intrepid = http://old-releases.ubuntu.com/ubuntu -# mirror_karmic = http://archive.ubuntu.com/ubuntu +# mirror_jaunty = http://old-releases.ubuntu.com/ubuntu +# mirror_karmic = http://old-releases.ubuntu.com/ubuntu # mirror_lucid = http://archive.ubuntu.com/ubuntu # mirror_maverick = http://archive.ubuntu.com/ubuntu # mirror_natty = http://archive.ubuntu.com/ubuntu # mirror_oneiric = http://archive.ubuntu.com/ubuntu +# mirror_precise = http://archive.ubuntu.com/ubuntu #