github.com/xen-tools.xen-tools
1
0
Fork 0
mirror of synced 2026-02-17 04:27:02 +00:00
Code Releases Activity

Handle Sarge amd64 case properly

Browse Source 
Uses File::Which, (build-) dependency on libfile-which-perl added
This commit is contained in:
Axel Beckert
2013-01-17 22:48:15 +01:00
parent 3456849ec8
commit 97553c50fb
4 changed files with 11 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
bin/xen-create-image
View File

@@ -789,6 +789,7 @@ use Env;
use File::Path qw/ mkpath /;
use File::Temp qw/ tempdir /;
use File::Copy qw/ mv cp /;
use File::Which;
use Getopt::Long;
use Pod::Usage;
use Data::Dumper;
@@ -1325,7 +1326,7 @@ sub setupDefaultOptions
$CONFIG{ 'mirror_'.$debdist } = $CONFIG{ 'mirror' }
}
foreach my $debdist (qw(sarge etch lenny)) {
$CONFIG{ 'mirror_'.$debdist } = 'http://archive.debian.org/debian';
$CONFIG{ 'mirror_'.$debdist } = 'http://archive.debian.org/debian-archive/debian';
}
# Initialize per distribution mirror defaults: Ubuntu
foreach my $ubuntudist (qw(hardy lucid oneiric precise quantal raring)) {
@@ -1335,7 +1336,8 @@ sub setupDefaultOptions
$CONFIG{ 'mirror_'.$ubuntudist } = 'http://old-releases.ubuntu.com/ubuntu';
}
$CONFIG{ 'apt_proxy' } = '';
$CONFIG{ 'arch' } = '';
$CONFIG{ 'arch' } =
which('dpkg') ? `dpkg --print-architecture` : '';
$CONFIG{ 'fs' } = 'ext3';
$CONFIG{ 'force' } = 0;
$CONFIG{ 'no_xen_ok' } = 0;
@@ -1825,9 +1827,10 @@ sub checkArguments
#
if ( $CONFIG{ 'dist' } =~ /sarge/ and
$CONFIG{ 'arch' } =~ /amd64/ and
$CONFIG{ 'mirror_sarge' } eq 'http://archive.debian.org/debian' )
$CONFIG{ 'mirror_sarge' } =~ m(/debian-archive/debian/?$))
{
$CONFIG{ 'mirror_sarge' } = 'http://archive.debian.org/debian-amd64';
$CONFIG{ 'mirror_sarge' } =~
s(/debian-archive/debian/?)(/debian-archive/debian-amd64);
}
#