github.com/xen-tools.xen-tools
1
0
Fork 0
mirror of synced 2026-01-18 16:56:58 +00:00
Code Releases Activity

Let --mirror overrule per-distro mirror defaults

Browse Source 
Previously the --mirror value was ignored if a default mirror for the
--dist value has been defined.

Now the --mirror value is by default unset and filled with the
per-distro default mirror in that case.
This commit is contained in:
Axel Beckert 2010-05-17 02:52:19 +02:00
parent 98514d3fc2
commit cea763b669
1 changed files with 14 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
bin/xen-create-image
View File

@ -1213,7 +1213,7 @@ sub setupDefaultOptions
# Default distribution is Debian Stable
$CONFIG{ 'dist' } = 'stable';
$CONFIG{ 'mirror' } = 'http://ftp.debian.org/debian';
$CONFIG{ 'mirror' } = '';
# Initialize per distribution mirror defaults: Debian
foreach my $debdist (qw(etch lenny squeeze sid testing stable unstable)) {
@ -1598,9 +1598,20 @@ sub checkArguments
# Sarge amd64 needs different default mirror
#
if ( $CONFIG{ 'dist' } =~ /sarge/ and
$CONFIG{ 'mirror' } eq 'http://archive.debian.org/debian' )
$CONFIG{ 'mirror_sarge' } eq 'http://archive.debian.org/debian' )
{
$CONFIG{ 'mirror' } = 'http://amd64.debian.net/debian';
$CONFIG{ 'mirror_sarge' } = 'http://amd64.debian.net/debian';
}
#
# If no mirror is set, use the default per-distro mirror
#
my $distMirror = "mirror_" . $CONFIG{ 'dist' };
if ( !$CONFIG{ 'mirror' } and
$CONFIG{ $distMirror } and
length( $CONFIG{ $distMirror } ) )
{
$CONFIG{ 'mirror' } = $CONFIG{ $distMirror };
}
#
@ -3138,14 +3149,6 @@ 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