diff options
| author | Rafael Garcia-Suarez <rgarciasuarez@mandriva.org> | 2004-10-19 12:39:04 +0000 |
|---|---|---|
| committer | Rafael Garcia-Suarez <rgarciasuarez@mandriva.org> | 2004-10-19 12:39:04 +0000 |
| commit | 5a09350052ada4a3cf121c6f942170bb8f0922a7 (patch) | |
| tree | 6aa5f1d76999cb94434910fd816052482531807d /perl-install/install_any.pm | |
| parent | 45d0fd32182ee9eac02c4fe2b763aeb8326a53e7 (diff) | |
| download | drakx-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_any.pm')
| -rw-r--r-- | perl-install/install_any.pm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm index 4aed8387c..33800b4b3 100644 --- a/perl-install/install_any.pm +++ b/perl-install/install_any.pm @@ -437,6 +437,7 @@ sub prep_net_suppl_media { network::netconnect::main($o->{prefix}, $o->{netcnx} ||= {}, $o, $o->{modules_conf}, $o->{netc}, $o->{mouse}, $o->{intf}, 0, 1); require install_interactive; install_interactive::upNetwork($o); + sleep(3); } sub selectSupplMedia { @@ -506,7 +507,7 @@ sub selectSupplMedia { $url = $o->ask_from_entry('', N("URL of the mirror?")) or return 'error'; } useMedium($medium_name); - require http; + require http if $suppl_method eq 'http'; require ftp if $suppl_method eq 'ftp'; #- first, try to find an hdlists file eval { pkgs::psUsingHdlists($o, $suppl_method, $url, $o->{packages}, $medium_name, \&setup_suppl_medium) }; |