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.

4 files changed, 168 insertions, 15 deletions

diff --git a/perl-install/crypto.pm b/perl-install/crypto.pm
index 8e39c22ff..b0e8b5631 100644
--- a/perl-install/crypto.pm
+++ b/perl-install/crypto.pm
@@ -46,16 +46,21 @@ use ftp;
 
 sub mirror2text { $mirrors{$_[0]} && $mirrors{$_[0]}[0] . '|' . $_[0] }
 sub mirrors {
-    my ($o_distro_type) = @_;
+    my ($o_distro_type, $o_use_local_list) = @_;
 
     unless (keys %mirrors) {
-	#- contact the following URL to retrieve list of mirror.
-	#- http://www.linux-mandrake.com/mirrorsfull.list
-	require http;
-	my $f = http::getFile("http://www.linux-mandrake.com/mirrorsfull.list");
+	my $f;
+	if ($o_use_local_list) {
+	    $f = \*DATA;
+	} else {
+	    #- contact the following URL to retrieve the list of mirrors.
+	    #- http://www.linux-mandrake.com/mirrorsfull.list
+	    require http;
+	    my $f = http::getFile("http://www.linux-mandrake.com/mirrorsfull.list");
+	}
 
 	local $SIG{ALRM} = sub { die "timeout" };
-	alarm 60;
+	$o_use_local_list or alarm 60;
 	my $distro_type = $o_distro_type || 'updates';
 	my $sub_dir = $distro_type =~ /cooker|community/ ? '' : '/' . version() . '/main_updates';
 	foreach (<$f>) {
@@ -69,8 +74,10 @@ sub mirrors {
 	    }
 	    $mirrors{$url} = [ $land, $dir . $sub_dir ];
 	}
-	http::getFile('/XXX'); #- close connection.
-	alarm 0; 
+	unless ($o_use_local_list) {
+	    http::getFile('/XXX'); #- close connection.
+	    alarm 0; 
+	}
 
 	#- now add static mirror (in case of something wrong happened above).
 	add2hash(\%mirrors, \%static_mirrors);
@@ -174,3 +181,145 @@ sub get {
 }
 
 1;
+
+#- mirror list, hardcoded here to be used in mini-cds (ftp suppl. media)
+__DATA__
+communityi586:ftp://ftp-linux.cc.gatech.edu/pub/linux/distributions/mandrake/devel/community/i586/media/main
+communityi586:ftp://ftp-stud.fht-esslingen.de/pub/Mirrors/Mandrakelinux/devel/community/i586/media/main
+communityi586:ftp://ftp.gwdg.de/pub/linux/mandrakelinux/devel/community/i586/media/main
+communityi586:ftp://ftp.join.uni-muenster.de/pub/linux/distributions/mandrake-devel/community/i586/media/main
+communityi586:ftp://ftp.lip6.fr/pub/linux/distributions/Mandrakelinux/devel/community/i586/media/main
+communityi586:ftp://ftp.nluug.nl/pub/os/Linux/distr/Mandrake/devel/community/i586/media/main
+communityi586:ftp://ftp.proxad.net/pub/Distributions_Linux/Mandrakelinux/devel/community/i586/media/main
+communityi586:ftp://ftp.sunet.se/pub/Linux/distributions/mandrakelinux/devel/community/i586/media/main
+communityi586:ftp://ftp.surfnet.nl/pub/os/Linux/distr/Mandrakelinux/devel/community/i586/media/main
+communityi586:ftp://ftp.tugraz.at/mirror/Mandrakelinux/devel/community/i586/media/main
+communityi586:ftp://ftp.uninett.no/pub/unix/Linux/Mandrakelinux/devel/community/i586/media/main
+communityi586:ftp://ftp.u-strasbg.fr/pub/linux/distributions/mandrakelinux/devel/community/i586/media/main
+communityi586:ftp://gd.tuwien.ac.at/pub/linux/Mandrakelinux/devel/community/i586/media/main
+communityi586:ftp://jungle.metalab.unc.edu/pub/Linux/distributions/mandrake/Mandrakelinux/devel/community/i586/media/main
+communityi586:ftp://mandrake.contactel.cz/Mandrakelinux/devel/community/i586/media/main
+communityi586:ftp://sunsite.informatik.rwth-aachen.de/pub/Linux/mandrake-devel/community/i586/media/main
+cookeri586:ftp://ftp-linux.cc.gatech.edu/pub/linux/distributions/mandrake/devel/cooker/i586/media/main
+cookeri586:ftp://ftp-stud.fht-esslingen.de/pub/Mirrors/Mandrakelinux/devel/cooker/i586/media/main
+cookeri586:ftp://ftp.club-internet.fr/pub/unix/linux/distributions/Mandrakelinux/devel/cooker/i586/media/main
+cookeri586:ftp://ftp.gwdg.de/pub/linux/mandrakelinux/devel/cooker/i586/media/main
+cookeri586:ftp://ftp.join.uni-muenster.de/pub/linux/distributions/mandrake-devel/cooker/i586/media/main
+cookeri586:ftp://ftp.lip6.fr/pub/linux/distributions/Mandrakelinux/devel/cooker/i586/media/main
+cookeri586:ftp://ftp.nluug.nl/pub/os/Linux/distr/Mandrake/devel/cooker/i586/media/main
+cookeri586:ftp://ftp.proxad.net/pub/Distributions_Linux/Mandrakelinux/devel/cooker/i586/media/main
+cookeri586:ftp://ftp.sunet.se/pub/Linux/distributions/mandrakelinux/devel/cooker/i586/media/main
+cookeri586:ftp://ftp.surfnet.nl/pub/os/Linux/distr/Mandrakelinux/devel/cooker/i586/media/main
+cookeri586:ftp://ftp.tugraz.at/mirror/Mandrakelinux/devel/cooker/i586/media/main
+cookeri586:ftp://ftp.uninett.no/pub/unix/Linux/Mandrakelinux/devel/cooker/i586/media/main
+cookeri586:ftp://ftp.u-strasbg.fr/pub/linux/distributions/mandrakelinux/devel/cooker/i586/media/main
+cookeri586:ftp://gd.tuwien.ac.at/pub/linux/Mandrakelinux/devel/cooker/i586/media/main
+cookeri586:ftp://mandrake.contactel.cz/Mandrakelinux/devel/cooker/i586/media/main
+cookeri586:ftp://sunsite.informatik.rwth-aachen.de/pub/Linux/mandrake-devel/cooker/i586/media/main
+updatesi586:ftp://ftp-linux.cc.gatech.edu/pub/linux/distributions/mandrake/official/updates
+updatesi586:ftp://ftp-stud.fht-esslingen.de/pub/Mirrors/Mandrakelinux/official/updates
+updatesi586:ftp://ftp.club-internet.fr/pub/unix/linux/distributions/Mandrakelinux/official/updates
+updatesi586:ftp://ftp.esat.net/pub/linux/mandrakelinux/official/updates
+updatesi586:ftp://ftp.gwdg.de/pub/linux/mandrakelinux/official/updates
+updatesi586:ftp://ftp.ikoula.com/pub/ftp.mandrake-linux.com/Mandrakelinux/official/updates
+updatesi586:ftp://ftp.join.uni-muenster.de/pub/linux/distributions/mandrake/updates
+updatesi586:ftp://ftp.lip6.fr/pub/linux/distributions/Mandrakelinux/official/updates
+updatesi586:ftp://ftp.nluug.nl/pub/os/Linux/distr/Mandrakelinux/official/updates
+updatesi586:ftp://ftp.pcds.ch/pub/Mandrakelinux/official/updates
+updatesi586:ftp://ftp.prew.hu/pub/Linux/Mandrakelinux/official/updates
+updatesi586:ftp://ftp.proxad.net/pub/Distributions_Linux/Mandrakelinux/official/updates
+updatesi586:ftp://ftp.ps.pl/mirrors/Mandrakelinux/official/updates
+updatesi586:ftp://ftp.sunet.se/pub/Linux/distributions/mandrakelinux/official/updates
+updatesi586:ftp://ftp.surfnet.nl/pub/os/Linux/distr/Mandrakelinux/official/updates
+updatesi586:ftp://ftp.tugraz.at/mirror/Mandrakelinux/official/updates
+updatesi586:ftp://ftp.uninett.no/pub/unix/Linux/Mandrakelinux/official/updates
+updatesi586:ftp://ftp.uni-bayreuth.de/pub/linux/Mandrakelinux/official/updates
+updatesi586:ftp://ftp.u-strasbg.fr/pub/linux/distributions/mandrakelinux/official/updates
+updatesi586:ftp://ftp.vat.tu-dresden.de/pub/Mandrakelinux/official/updates
+updatesi586:ftp://gd.tuwien.ac.at/pub/linux/Mandrakelinux/official/updates
+updatesi586:ftp://jungle.metalab.unc.edu/pub/Linux/distributions/mandrake/Mandrakelinux/official/updates
+updatesi586:ftp://linux.cdpa.nsysu.edu.tw/pub/mandrake/updates
+updatesi586:ftp://mandrake.contactel.cz/Mandrakelinux/official/updates
+updatesi586:ftp://mandrake.mirrors.pair.com/Mandrakelinux/official/updates
+updatesi586:ftp://mirrors.secsup.org/pub/linux/mandrake/Mandrakelinux/official/updates
+updatesi586:ftp://spirit.profinet.sk/mirrors/Mandrake/updates
+updatesi586:ftp://sunsite.informatik.rwth-aachen.de/pub/Linux/mandrake/updates
+updatesi586:ftp://updates.roma2.infn.it/linux/updates/mandrake
+cookerppc:ftp://ftp-linux.cc.gatech.edu/pub/linux/distributions/mandrake/devel/cooker/ppc/media/main
+cookerppc:ftp://ftp-stud.fht-esslingen.de/pub/Mirrors/Mandrakelinux/devel/cooker/ppc/media/main
+cookerppc:ftp://ftp.club-internet.fr/pub/unix/linux/distributions/Mandrakelinux/devel/cooker/ppc/media/main
+cookerppc:ftp://ftp.gwdg.de/pub/linux/mandrakelinux/devel/cooker/ppc/media/main
+cookerppc:ftp://ftp.join.uni-muenster.de/pub/linux/distributions/mandrake-devel/cooker/ppc/media/main
+cookerppc:ftp://ftp.nluug.nl/pub/os/Linux/distr/Mandrake/devel/cooker/ppc/media/main
+cookerppc:ftp://ftp.proxad.net/pub/Distributions_Linux/Mandrakelinux/devel/cooker/ppc/media/main
+cookerppc:ftp://ftp.sunet.se/pub/Linux/distributions/mandrakelinux/devel/cooker/ppc/media/main
+cookerppc:ftp://ftp.surfnet.nl/pub/os/Linux/distr/Mandrakelinux/devel/cooker/ppc/media/main
+cookerppc:ftp://ftp.tugraz.at/mirror/Mandrakelinux/devel/cooker/ppc/media/main
+cookerppc:ftp://ftp.uninett.no/pub/unix/Linux/Mandrakelinux/devel/cooker/ppc/media/main
+cookerppc:ftp://gd.tuwien.ac.at/pub/linux/Mandrakelinux/devel/cooker/ppc/media/main
+cookerppc:ftp://mandrake.contactel.cz/Mandrakelinux/devel/cooker/ppc/media/main
+cookerppc:ftp://sunsite.informatik.rwth-aachen.de/pub/Linux/mandrake-devel/cooker/ppc/media/main
+updatesppc:ftp://ftp-linux.cc.gatech.edu/pub/linux/distributions/mandrake/official/updates/ppc
+updatesppc:ftp://ftp-stud.fht-esslingen.de/pub/Mirrors/Mandrakelinux/official/updates/ppc
+updatesppc:ftp://ftp.club-internet.fr/pub/unix/linux/distributions/Mandrakelinux/official/updates/ppc
+updatesppc:ftp://ftp.esat.net/pub/linux/mandrakelinux/official/updates/ppc
+updatesppc:ftp://ftp.gwdg.de/pub/linux/mandrakelinux/official/updates/ppc
+updatesppc:ftp://ftp.ikoula.com/pub/ftp.mandrake-linux.com/Mandrakelinux/official/updates/ppc
+updatesppc:ftp://ftp.join.uni-muenster.de/pub/linux/distributions/mandrake/updates/ppc
+updatesppc:ftp://ftp.nluug.nl/pub/os/Linux/distr/Mandrakelinux/official/updates/ppc
+updatesppc:ftp://ftp.pcds.ch/pub/Mandrakelinux/official/updates/ppc
+updatesppc:ftp://ftp.proxad.net/pub/Distributions_Linux/Mandrakelinux/official/updates/ppc
+updatesppc:ftp://ftp.ps.pl/mirrors/Mandrakelinux/official/updates/ppc
+updatesppc:ftp://ftp.sunet.se/pub/Linux/distributions/mandrakelinux/official/updates/ppc
+updatesppc:ftp://ftp.surfnet.nl/pub/os/Linux/distr/Mandrakelinux/official/updates/ppc
+updatesppc:ftp://ftp.tugraz.at/mirror/Mandrakelinux/official/updates/ppc
+updatesppc:ftp://ftp.uninett.no/pub/unix/Linux/Mandrakelinux/official/updates/ppc
+updatesppc:ftp://ftp.uni-bayreuth.de/pub/linux/Mandrakelinux/official/updates/ppc
+updatesppc:ftp://ftp.vat.tu-dresden.de/pub/Mandrakelinux/official/updates/ppc
+updatesppc:ftp://gd.tuwien.ac.at/pub/linux/Mandrakelinux/official/updates/ppc
+updatesppc:ftp://jungle.metalab.unc.edu/pub/Linux/distributions/mandrake/Mandrakelinux/official/updates/ppc
+updatesppc:ftp://linux.cdpa.nsysu.edu.tw/pub/mandrake/updates/ppc
+updatesppc:ftp://mandrake.contactel.cz/Mandrakelinux/official/updates/ppc
+updatesppc:ftp://mandrake.mirrors.pair.com/Mandrakelinux/official/updates/ppc
+updatesppc:ftp://mirrors.secsup.org/pub/linux/mandrake/Mandrakelinux/official/updates/ppc
+updatesppc:ftp://spirit.profinet.sk/mirrors/Mandrake/updates/ppc
+updatesppc:ftp://sunsite.informatik.rwth-aachen.de/pub/Linux/mandrake/updates/ppc
+updatesppc:ftp://updates.roma2.infn.it/linux/updates/mandrake/ppc
+cookerx86_64:ftp://ftp-linux.cc.gatech.edu/pub/linux/distributions/mandrake/devel/cooker/amd64/media/main
+cookerx86_64:ftp://ftp-stud.fht-esslingen.de/pub/Mirrors/Mandrakelinux/devel/cooker/amd64/media/main
+cookerx86_64:ftp://ftp.club-internet.fr/pub/unix/linux/distributions/Mandrakelinux/devel/cooker/amd64/media/main
+cookerx86_64:ftp://ftp.gwdg.de/pub/linux/mandrakelinux/devel/cooker/amd64/media/main
+cookerx86_64:ftp://ftp.join.uni-muenster.de/pub/linux/distributions/mandrake-devel/cooker/amd64/media/main
+cookerx86_64:ftp://ftp.nluug.nl/pub/os/Linux/distr/Mandrake/devel/cooker/amd64/media/main
+cookerx86_64:ftp://ftp.proxad.net/pub/Distributions_Linux/Mandrakelinux/devel/cooker/amd64/media/main
+cookerx86_64:ftp://ftp.sunet.se/pub/Linux/distributions/mandrakelinux/devel/cooker/amd64/media/main
+cookerx86_64:ftp://ftp.surfnet.nl/pub/os/Linux/distr/Mandrakelinux/devel/cooker/amd64/media/main
+cookerx86_64:ftp://ftp.tugraz.at/mirror/Mandrakelinux/devel/cooker/amd64/media/main
+cookerx86_64:ftp://ftp.uninett.no/pub/unix/Linux/Mandrakelinux/devel/cooker/amd64/media/main
+cookerx86_64:ftp://gd.tuwien.ac.at/pub/linux/Mandrakelinux/devel/cooker/amd64/media/main
+cookerx86_64:ftp://mandrake.contactel.cz/Mandrakelinux/devel/cooker/amd64/media/main
+updatesx86_64:ftp://ftp-linux.cc.gatech.edu/pub/linux/distributions/mandrake/official/updates/amd64
+updatesx86_64:ftp://ftp-stud.fht-esslingen.de/pub/Mirrors/Mandrakelinux/official/updates/amd64
+updatesx86_64:ftp://ftp.club-internet.fr/pub/unix/linux/distributions/Mandrakelinux/official/updates/amd64
+updatesx86_64:ftp://ftp.esat.net/pub/linux/mandrakelinux/official/updates/amd64
+updatesx86_64:ftp://ftp.gwdg.de/pub/linux/mandrakelinux/official/updates/amd64
+updatesx86_64:ftp://ftp.ikoula.com/pub/ftp.mandrake-linux.com/Mandrakelinux/official/updates/amd64
+updatesx86_64:ftp://ftp.join.uni-muenster.de/pub/linux/distributions/mandrake/updates/amd64
+updatesx86_64:ftp://ftp.nluug.nl/pub/os/Linux/distr/Mandrakelinux/official/updates/amd64
+updatesx86_64:ftp://ftp.pcds.ch/pub/Mandrakelinux/official/updates/amd64
+updatesx86_64:ftp://ftp.proxad.net/pub/Distributions_Linux/Mandrakelinux/official/updates/amd64
+updatesx86_64:ftp://ftp.ps.pl/mirrors/Mandrakelinux/official/updates/amd64
+updatesx86_64:ftp://ftp.sunet.se/pub/Linux/distributions/mandrakelinux/official/updates/amd64
+updatesx86_64:ftp://ftp.surfnet.nl/pub/os/Linux/distr/Mandrakelinux/official/updates/amd64
+updatesx86_64:ftp://ftp.tugraz.at/mirror/Mandrakelinux/official/updates/amd64
+updatesx86_64:ftp://ftp.uninett.no/pub/unix/Linux/Mandrakelinux/official/updates/amd64
+updatesx86_64:ftp://ftp.uni-bayreuth.de/pub/linux/Mandrakelinux/official/updates/amd64
+updatesx86_64:ftp://ftp.vat.tu-dresden.de/pub/Mandrakelinux/official/updates/amd64
+updatesx86_64:ftp://gd.tuwien.ac.at/pub/linux/Mandrakelinux/official/updates/amd64
+updatesx86_64:ftp://jungle.metalab.unc.edu/pub/Linux/distributions/mandrake/Mandrakelinux/official/updates/amd64
+updatesx86_64:ftp://mandrake.contactel.cz/Mandrakelinux/official/updates/amd64
+updatesx86_64:ftp://mandrake.mirrors.pair.com/Mandrakelinux/official/updates/amd64
+updatesx86_64:ftp://mirrors.secsup.org/pub/linux/mandrake/Mandrakelinux/official/updates/amd64
+updatesx86_64:ftp://spirit.profinet.sk/mirrors/Mandrake/updates/amd64
+updatesx86_64:ftp://sunsite.informatik.rwth-aachen.de/pub/Linux/mandrake/updates/amd64
+updatesx86_64:ftp://updates.roma2.infn.it/linux/updates/mandrake/amd64
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) };
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;
 }
diff --git a/perl-install/pkgs.pm b/perl-install/pkgs.pm
index 1e0694503..93e02cf3c 100644
--- a/perl-install/pkgs.pm
+++ b/perl-install/pkgs.pm
@@ -390,7 +390,8 @@ sub psUpdateHdlistsDeps {
 sub psUsingHdlists {
     my ($o, $method, $o_hdlistsprefix, $o_packages, $o_initialmedium, $o_callback) = @_;
     my $prefix = $o->{prefix};
-    my $listf = install_any::getFile($o_hdlistsprefix ? "$o_hdlistsprefix/media/media_info/hdlists" : 'media/media_info/hdlists')
+    my $is_ftp = $o_hdlistsprefix =~ /^ftp:/;
+    my $listf = install_any::getFile($o_hdlistsprefix && !$is_ftp ? "$o_hdlistsprefix/media/media_info/hdlists" : 'media/media_info/hdlists')
 	or die "no hdlists found";
     my ($suppl_CDs, $deselectionAllowed) = (0, 0);
     if (!$o_packages) {
@@ -409,14 +410,14 @@ sub psUsingHdlists {
 	#- we'll ask afterwards for supplementary CDs, if the hdlists file contains
 	#- a line that begins with "suppl"
 	if (/^suppl/) { $suppl_CDs = 1; next }
-	#- if the hdlists contains a line "askmedia", delection of media found
+	#- if the hdlists contains a line "askmedia", deletion of media found
 	#- in this hdlist is allowed
 	if (/^askmedia/) { $deselectionAllowed = 1; next }
 	my $cdsuppl = index($medium_name, 's') >= 0;
 	m/^\s*(noauto:)?(hdlist\S*\.cz2?)\s+(\S+)\s*(.*)$/ or die qq(invalid hdlist description "$_" in hdlists file);
 	push @hdlists, [ $2, $medium_name, $3, $4, !$1, 
 	    #- hdlist path, suppl CDs are mounted on /mnt/cdrom :
-	    $o_hdlistsprefix ? "$o_hdlistsprefix/media/media_info/$2" : undef,
+	    $o_hdlistsprefix ? ($is_ftp ? "media/media_info/$2" : "$o_hdlistsprefix/media/media_info/$2") : undef,
 	];
 	$cdsuppl ? ($medium_name = ($medium_name + 1) . 's') : ++$medium_name;
     }