1
0
mirror of synced 2026-01-25 19:36:27 +00:00

2007-06-11 23:33:18 by steve

Allow per-dist mirrors.
This commit is contained in:
steve
2007-06-11 23:33:19 +00:00
parent 634453b122
commit 71fb34fae7
3 changed files with 28 additions and 4 deletions

View File

@@ -564,7 +564,7 @@ Install an X11 server, using VNC and XDM
--
http://www.steve.org.uk/
$Id: xen-create-image,v 1.151 2007-06-02 11:48:18 radu Exp $
$Id: xen-create-image,v 1.152 2007-06-11 23:33:18 steve Exp $
=cut
@@ -1239,7 +1239,7 @@ sub parseCommandLineArguments
if ( $VERSION )
{
my $REVISION = '$Revision: 1.151 $';
my $REVISION = '$Revision: 1.152 $';
if ( $REVISION =~ /1.([0-9.]+) / )
{
$REVISION = $1;
@@ -2478,6 +2478,15 @@ sub mountImage
sub installSystem
{
#
# We might have a per-distro mirror.
my $distMirror = "mirror_" . $CONFIG{'dist'};
if ( $CONFIG{$distMirror} && length( $CONFIG{$distMirror} ) )
{
$CONFIG{'mirror'} = $CONFIG{$distMirror};
}
#
#
# Basic command
#

2
debian/changelog vendored
View File

@@ -1,6 +1,8 @@
* Only add Debian sources for security.debian.org if enabled upon
the host.
* Allow per-dist mirrors. Which is useful when working with mixed
Debian + Ubuntu installations.
xen-tools (3.4-1) unstable; urgency=low

View File

@@ -177,8 +177,7 @@ initrd = /boot/initrd.img-`uname -r`
#
#
# The default mirror for debootstrap which can be used to install
# Debian Sid, Sarge, and Etch.
# The default mirror for debootstrap to install Debian-derived distributions
#
mirror = http://ftp.us.debian.org/debian/
@@ -187,6 +186,20 @@ mirror = http://ftp.us.debian.org/debian/
#
# mirror = http://gb.archive.ubuntu.com/ubuntu/
#
# If you like you could use per-distribution mirrors, which will
# be more useful if you're working in an environment where you want
# to regularly use multiple distributions:
#
# mirror_sid=http://ftp.us.debian.org/debian
# mirror_sarge=http://ftp.us.debian.org/debian
# mirror_etch=http://ftp.us.debian.org/debian
# mirror_dapper=http://archive.ubuntu.com/ubuntu
# mirror_edgy=http://archive.ubuntu.com/ubuntu
# mirror_feisty=http://archive.ubuntu.com/ubuntu
# mirror_gutsy=http://archive.ubuntu.com/ubuntu
#
# Uncomment if you wish newly created images to boot once they've been
# created.