summaryrefslogtreecommitdiffstats
path: root/perl-install/install_steps_interactive.pm
diff options
context:
space:
mode:
authorRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2004-10-19 12:39:04 +0000
committerRafael Garcia-Suarez <rgarciasuarez@mandriva.org>2004-10-19 12:39:04 +0000
commit5a09350052ada4a3cf121c6f942170bb8f0922a7 (patch)
tree6aa5f1d76999cb94434910fd816052482531807d /perl-install/install_steps_interactive.pm
parent45d0fd32182ee9eac02c4fe2b763aeb8326a53e7 (diff)
downloaddrakx-5a09350052ada4a3cf121c6f942170bb8f0922a7.tar
drakx-5a09350052ada4a3cf121c6f942170bb8f0922a7.tar.gz
drakx-5a09350052ada4a3cf121c6f942170bb8f0922a7.tar.bz2
drakx-5a09350052ada4a3cf121c6f942170bb8f0922a7.tar.xz
drakx-5a09350052ada4a3cf121c6f942170bb8f0922a7.zip
Installation with a ftp supplementary media (for mini-isos) :
inline the mirror list (since fetching it causes weird network problems). Fix the handling of relative urls in ftp media when fetching hdlists file.
Diffstat (limited to 'perl-install/install_steps_interactive.pm')
-rw-r--r--perl-install/install_steps_interactive.pm8
1 files changed, 5 insertions, 3 deletions
diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm
index a7268817d..8f4ed5102 100644
--- a/perl-install/install_steps_interactive.pm
+++ b/perl-install/install_steps_interactive.pm
@@ -402,8 +402,10 @@ sub askSupplMirror {
my $u = $o->{updates} ||= {};
require crypto;
my @mirrors = do {
- my $_w = $o->wait_message('', N("Contacting Mandrakelinux web site to get the list of available mirrors..."));
- crypto::mirrors($o->{distro_type});
+ $o->{distro_type} ||= 'community';
+ #- get the list of mirrors locally, to avoid weird bugs with making an
+ #- http request before ftp at this point of the install
+ crypto::mirrors($o->{distro_type}, 1);
};
push @mirrors, '-';
$o->ask_from_(
@@ -422,7 +424,7 @@ sub askSupplMirror {
return $o->ask_from_entry('', $message) || '';
}
my $url = "ftp://$u->{mirror}$crypto::mirrors{$u->{mirror}}[1]";
- $url =~ s!\bmedia/?$!!;
+ $url =~ s!/(?:media/)?main/?\z!!;
log::l("mirror chosen [$url]");
return $url;
}