Integrate fixes for mini-ISOs from the trunk.

2 files changed, 303 insertions, 16 deletions

diff --git a/perl-install/crypto.pm b/perl-install/crypto.pm
index 8e39c22ff..058630188 100644
--- a/perl-install/crypto.pm
+++ b/perl-install/crypto.pm
@@ -11,17 +11,22 @@ use log;
 use ftp;
 
 %url2land = (
-	     fr => N("France"),
-	     cr => N("Costa Rica"),
+	     at => N("Austria"),
 	     be => N("Belgium"),
+	     ch => N("Switzerland"),
+	     cr => N("Costa Rica"),
 	     cz => N("Czech Republic"),
 	     de => N("Germany"),
+	     fr => N("France"),
 	     gr => N("Greece"),
+	     hu => N("Hungary"),
+	     it => N("Italy"),
+	     nl => N("Netherlands"),
 	     no => N("Norway"),
+	     pl => N("Poland"),
 	     se => N("Sweden"),
-	     nl => N("Netherlands"),
-	     it => N("Italy"),
-	     at => N("Austria"),
+	     sk => N("Slovakia"),
+	     tw => N("Taiwan"),
 	    );
 
 %land2tzs = (
@@ -46,16 +51,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;
+	    $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 +79,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 +186,271 @@ 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
+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/x86_64/media/main
+cookerx86_64:ftp://ftp-stud.fht-esslingen.de/pub/Mirrors/Mandrakelinux/devel/cooker/x86_64/media/main
+cookerx86_64:ftp://ftp.club-internet.fr/pub/unix/linux/distributions/Mandrakelinux/devel/cooker/x86_64/media/main
+cookerx86_64:ftp://ftp.gwdg.de/pub/linux/mandrakelinux/devel/cooker/x86_64/media/main
+cookerx86_64:ftp://ftp.join.uni-muenster.de/pub/linux/distributions/mandrake-devel/cooker/x86_64/media/main
+cookerx86_64:ftp://ftp.nluug.nl/pub/os/Linux/distr/Mandrake/devel/cooker/x86_64/media/main
+cookerx86_64:ftp://ftp.proxad.net/pub/Distributions_Linux/Mandrakelinux/devel/cooker/x86_64/media/main
+cookerx86_64:ftp://ftp.sunet.se/pub/Linux/distributions/mandrakelinux/devel/cooker/x86_64/media/main
+cookerx86_64:ftp://ftp.surfnet.nl/pub/os/Linux/distr/Mandrakelinux/devel/cooker/x86_64/media/main
+cookerx86_64:ftp://ftp.tugraz.at/mirror/Mandrakelinux/devel/cooker/x86_64/media/main
+cookerx86_64:ftp://ftp.uninett.no/pub/unix/Linux/Mandrakelinux/devel/cooker/x86_64/media/main
+cookerx86_64:ftp://gd.tuwien.ac.at/pub/linux/Mandrakelinux/devel/cooker/x86_64/media/main
+cookerx86_64:ftp://mandrake.contactel.cz/Mandrakelinux/devel/cooker/x86_64/media/main
+updatesx86_64:ftp://ftp-linux.cc.gatech.edu/pub/linux/distributions/mandrake/official/updates/x86_64
+updatesx86_64:ftp://ftp-stud.fht-esslingen.de/pub/Mirrors/Mandrakelinux/official/updates/x86_64
+updatesx86_64:ftp://ftp.club-internet.fr/pub/unix/linux/distributions/Mandrakelinux/official/updates/x86_64
+updatesx86_64:ftp://ftp.esat.net/pub/linux/mandrakelinux/official/updates/x86_64
+updatesx86_64:ftp://ftp.gwdg.de/pub/linux/mandrakelinux/official/updates/x86_64
+updatesx86_64:ftp://ftp.ikoula.com/pub/ftp.mandrake-linux.com/Mandrakelinux/official/updates/x86_64
+updatesx86_64:ftp://ftp.join.uni-muenster.de/pub/linux/distributions/mandrake/updates/x86_64
+updatesx86_64:ftp://ftp.nluug.nl/pub/os/Linux/distr/Mandrakelinux/official/updates/x86_64
+updatesx86_64:ftp://ftp.pcds.ch/pub/Mandrakelinux/official/updates/x86_64
+updatesx86_64:ftp://ftp.proxad.net/pub/Distributions_Linux/Mandrakelinux/official/updates/x86_64
+updatesx86_64:ftp://ftp.ps.pl/mirrors/Mandrakelinux/official/updates/x86_64
+updatesx86_64:ftp://ftp.sunet.se/pub/Linux/distributions/mandrakelinux/official/updates/x86_64
+updatesx86_64:ftp://ftp.surfnet.nl/pub/os/Linux/distr/Mandrakelinux/official/updates/x86_64
+updatesx86_64:ftp://ftp.tugraz.at/mirror/Mandrakelinux/official/updates/x86_64
+updatesx86_64:ftp://ftp.uninett.no/pub/unix/Linux/Mandrakelinux/official/updates/x86_64
+updatesx86_64:ftp://ftp.uni-bayreuth.de/pub/linux/Mandrakelinux/official/updates/x86_64
+updatesx86_64:ftp://ftp.vat.tu-dresden.de/pub/Mandrakelinux/official/updates/x86_64
+updatesx86_64:ftp://gd.tuwien.ac.at/pub/linux/Mandrakelinux/official/updates/x86_64
+updatesx86_64:ftp://jungle.metalab.unc.edu/pub/Linux/distributions/mandrake/Mandrakelinux/official/updates/x86_64
+updatesx86_64:ftp://mandrake.contactel.cz/Mandrakelinux/official/updates/x86_64
+updatesx86_64:ftp://mandrake.mirrors.pair.com/Mandrakelinux/official/updates/x86_64
+updatesx86_64:ftp://mirrors.secsup.org/pub/linux/mandrake/Mandrakelinux/official/updates/x86_64
+updatesx86_64:ftp://spirit.profinet.sk/mirrors/Mandrake/updates/x86_64
+updatesx86_64:ftp://sunsite.informatik.rwth-aachen.de/pub/Linux/mandrake/updates/x86_64
+updatesx86_64:ftp://updates.roma2.infn.it/linux/updates/mandrake/x86_64
+cookeri586:ftp://anorien.csc.warwick.ac.uk/Mandrakelinux/devel/cooker
+cookeri586:ftp://bo.mirror.garr.it/pub/mirrors/Mandrake/devel/cooker
+cookeri586:ftp://ftp-stud.fht-esslingen.de/pub/Mirrors/Mandrakelinux/devel/cooker
+cookeri586:ftp://ftp.aso.ee/pub/Mandrake/devel/cooker
+cookeri586:ftp://ftp.belnet.be/packages/mandrakelinux/devel/cooker
+cookeri586:ftp://ftp.bylinux.net/pub/mirror/Mandrakelinux/devel/cooker
+cookeri586:ftp://ftp.cica.es/pub/Linux/Mandrakelinux/devel/cooker
+cookeri586:ftp://ftp.ciril.fr/pub/linux/mandrakelinux/devel/cooker
+cookeri586:ftp://ftp.cise.ufl.edu/pub/mirrors/mandrake/Mandrakelinux/devel/cooker
+cookeri586:ftp://ftp.cs.ucr.edu/pub/mirrors/mandrakelinux/devel/cooker
+cookeri586:ftp://ftp.ens-cachan.fr/pub/Mandrakelinux/devel/cooker
+cookeri586:ftp://ftp.esat.net/pub/linux/mandrakelinux/devel/cooker
+cookeri586:ftp://ftp.fh-giessen.de/pub/linux/Mandrakelinux//devel/cooker
+cookeri586:ftp://ftp.fh-wolfenbuettel.de/linux/mandrakelinux/devel/cooker
+cookeri586:ftp://ftp.fi.muni.cz/pub/linux/mandrakelinux/devel/cooker
+cookeri586:ftp://ftp.free.fr/mirrors/ftp.mandrake-linux.com/Mandrakelinux/devel/cooker
+cookeri586:ftp://ftp.gtlib.cc.gatech.edu/pub/mandrake/devel/cooker
+cookeri586:ftp://ftp.gwdg.de/pub/linux/mandrakelinux/devel/cooker
+cookeri586:ftp://ftp.heanet.ie/pub/mandrake/Mandrakelinux/devel/cooker
+cookeri586:ftp://ftp.icm.edu.pl/pub/linux/mandrakelinux/devel/cooker
+cookeri586:ftp://ftp.informatik.hu-berlin.de/pub/Linux/Distributions/Mandrake/Mandrakelinux/devel/cooker
+cookeri586:ftp://ftp.int-evry.fr/pub/linux/mandrake/devel/cooker
+cookeri586:ftp://ftp.isu.edu.tw/pub/Linux/Mandrakelinux/devel/cooker
+cookeri586:ftp://ftp.isu.net.sa/pub/mirrors/ftp.mandrake.com/mandrakelinux/devel/cooker
+cookeri586:ftp://ftp.join.uni-muenster.de/pub/linux/distributions/mandrakelinux/devel/cooker
+cookeri586:ftp://ftp.kddlabs.co.jp/Linux/packages/Mandrake/devel/cooker
+cookeri586:ftp://ftp.linux.cz/pub/linux/mandrakelinux/devel/cooker
+cookeri586:ftp://ftp.lip6.fr/pub/linux/distributions/Mandrakelinux/devel/cooker
+cookeri586:ftp://ftp.mandrake.ikoula.com/Mandrakelinux/devel/cooker
+cookeri586:ftp://ftp.mirrorservice.org/pub/Mandrake_Linux/devel/cooker
+cookeri586:ftp://ftp.ndlug.nd.edu/pub/Mandrakelinux//devel/cooker
+cookeri586:ftp://ftp.nluug.nl/pub/os/Linux/distr/Mandrakelinux/devel/cooker
+cookeri586:ftp://ftp.phys.ttu.edu/pub/mandrakelinux/devel/cooker
+cookeri586:ftp://ftp.planetmirror.com/pub/Mandrake/devel/cooker
+cookeri586:ftp://ftp.proxad.net/pub/Distributions_Linux/Mandrakelinux/devel/cooker
+cookeri586:ftp://ftp.ps.pl/mirrors/mandrake/devel/cooker
+cookeri586:ftp://ftp.rediris.es/pub/linux/distributions/mandrakelinux/devel/cooker
+cookeri586:ftp://ftp.riken.go.jp/pub/Linux/mandrake/devel/cooker
+cookeri586:ftp://ftp.rutgers.edu/pub/Mandrakelinux/devel/cooker
+cookeri586:ftp://ftp.sh.cvut.cz/MIRRORS/Mandrake/mandrake/devel/cooker
+cookeri586:ftp://ftp.sun.ac.za/pub/linux/mandrake/pub/Linux/distributions/devel/cooker
+cookeri586:ftp://ftp.sunet.se/pub/Linux/distributions/mandrakelinux/devel/cooker
+cookeri586:ftp://ftp.sunsite.org.uk/package/mandrakelinux/devel/cooker
+cookeri586:ftp://ftp.surfnet.nl/pub/os/Linux/distr/Mandrakelinux/devel/cooker
+cookeri586:ftp://ftp.tu-chemnitz.de/pub/linux/mandrakelinux/devel/cooker
+cookeri586:ftp://ftp.u-strasbg.fr/pub/linux/distributions/mandrakelinux/devel/cooker
+cookeri586:ftp://ftp.uasw.edu/linux/mandrakelinux/devel/cooker
+cookeri586:ftp://ftp.uni-bayreuth.de/pub/linux/Mandrakelinux/devel/cooker
+cookeri586:ftp://ftp.uni-wuppertal.de/pub/linux/mandrake/Mandrakelinux/devel/cooker
+cookeri586:ftp://ftp.univ-lille1.fr/pub/os/linux/distributions/mandrakelinux/devel/cooker
+cookeri586:ftp://ftp.vat.tu-dresden.de/pub/Mandrakelinux/devel/cooker
+cookeri586:ftp://ftp3.mandrake.sk/mirrors/Mandrakelinux/devel/cooker
+cookeri586:ftp://gd.tuwien.ac.at/pub/linux/Mandrakelinux/devel/cooker
+cookeri586:ftp://helios.dii.utk.edu/pub/linux/Mandrake/devel/cooker
+cookeri586:ftp://hosef.ics.hawaii.edu//Mandrakelinux/devel/cooker
+cookeri586:ftp://linux.ntcu.net/dists/mandrake/devel/cooker
+cookeri586:ftp://linux.ups-tlse.fr/Mandrakelinux/devel/cooker
+cookeri586:ftp://mandrake.contactel.cz/Mandrakelinux/devel/cooker
+cookeri586:ftp://mandrake.mirrors.pair.com/Mandrakelinux//devel/cooker
+cookeri586:ftp://mdk.linux.org.tw/pub/mandrakelinux/devel/cooker
+cookeri586:ftp://mirror.aca.oakland.edu/pub/linux/mandrakelinux/devel/cooker
+cookeri586:ftp://mirror.cs.wisc.edu/pub/mirrors/linux/Mandrakelinux/devel/cooker
+cookeri586:ftp://mirror.etf.bg.ac.yu/distributions/Mandrakelinux/devel/cooker
+cookeri586:ftp://mirror.fis.unb.br/pub/linux/Mandrakelinux/devel/cooker
+cookeri586:ftp://mirror.pacific.net.au/linux/Mandrakelinux/devel/cooker
+cookeri586:ftp://mirror.switch.ch/mirror/mandrake/devel/cooker
+cookeri586:ftp://mirrors.secsup.org/pub/linux/mandrakelinux/devel/cooker
+cookeri586:ftp://mirrors.xmission.com/mandrake/devel/cooker
+cookeri586:ftp://public.planetmirror.com/pub/mandrake/devel/cooker
+cookeri586:ftp://ramses.wh2.tu-dresden.de/pub/mirrors/mandrake/devel/cooker
+cookeri586:ftp://raven.cslab.vt.edu/pub/linux/mandrakelinux/devel/cooker
+cookeri586:ftp://rpm.pbone.net/pub/mandrake/mandrakelinux/devel/cooker
+cookeri586:ftp://search.belnet.be/packages/mandrakelinux/devel/cooker
+cookeri586:ftp://sunsite.cnlab-switch.ch/mirror/mandrake/devel/cooker
+cookeri586:ftp://sunsite.icm.edu.pl/pub/Linux/mandrakelinux/devel/cooker
+cookeri586:ftp://sunsite.informatik.rwth-aachen.de/pub/Linux/mandrake/devel/cooker
+cookeri586:ftp://tux.cprm.net/pub/Mandrake/devel/cooker
+cookeri586:http://anorien.csc.warwick.ac.uk/mirrors/Mandrakelinux/devel/cooker
+cookeri586:http://ftp.esat.net/pub/linux/mandrakelinux/devel/cooker
+cookeri586:http://ftp.isu.net.sa/pub/mirrors/ftp.mandrake.com/mandrakelinux/devel/cooker
+cookeri586:http://ftp.nluug.nl/ftp/pub/os/Linux/distr/Mandrakelinux/devel/cooker
+cookeri586:http://ftp.rediris.es/pub/linux/distributions/mandrakelinux/devel/cooker
+cookeri586:http://ftp.surfnet.nl/ftp/pub/os/Linux/distr/Mandrakelinux/devel/cooker
+cookeri586:http://gd.tuwien.ac.at/pub/linux/Mandrakelinux/devel/cooker
+cookeri586:http://klid.dk/homeftp/mandrakelinux/devel/cooker
+cookeri586:http://sunsite.icm.edu.pl/pub/Linux/mandrakelinux/devel/cooker
+cookeri586:http://wftp.tu-chemnitz.de/pub/linux/mandrakelinux/devel/cooker
+cookeri586:http://www.gtlib.cc.gatech.edu/pub/mandrake/devel/cooker
+updatesi586:ftp://anorien.csc.warwick.ac.uk/Mandrakelinuxofficial/updates/10.1/RPMS/
+updatesi586:ftp://bo.mirror.garr.it/pub/mirrors/Mandrakeofficial/updates/10.1/RPMS/
+updatesi586:ftp://distro.ibiblio.org/pub/Linux/distributions/mandrake/Mandrakelinuxofficial/updates/10.1/RPMS/
+updatesi586:ftp://ftp-stud.fht-esslingen.de/pub/Mirrors/Mandrakelinuxofficial/updates/10.1/RPMS/
+updatesi586:ftp://ftp.aso.ee/pub/Mandrakeofficial/updates/10.1/RPMS/
+updatesi586:ftp://ftp.belnet.be/packages/mandrakelinuxofficial/updates/10.1/RPMS/
+updatesi586:ftp://ftp.cica.es/pub/Linux/Mandrakelinuxofficial/updates/10.1/RPMS/
+updatesi586:ftp://ftp.ciril.fr/pub/linux/mandrakelinuxofficial/updates/10.1/RPMS/
+updatesi586:ftp://ftp.cise.ufl.edu/pub/mirrors/mandrake/Mandrakelinuxofficial/updates/10.1/RPMS/
+updatesi586:ftp://ftp.club-internet.fr/pub/unix/linux/distributions/Mandrakelinuxofficial/updates/10.1/RPMS/
+updatesi586:ftp://ftp.cru.fr/pub/linux/Mandrakelinuxofficial/updates/10.1/RPMS/
+updatesi586:ftp://ftp.cs.ucr.edu/pub/mirrors/mandrakelinuxofficial/updates/10.1/RPMS/
+updatesi586:ftp://ftp.ens-cachan.fr/pub/Mandrakelinuxofficial/updates/10.1/RPMS/
+updatesi586:ftp://ftp.esat.net/pub/linux/mandrakelinuxofficial/updates/10.1/RPMS/
+updatesi586:ftp://ftp.fh-giessen.de/pub/linux/Mandrakelinux/official/updates/10.1/RPMS/
+updatesi586:ftp://ftp.fh-wolfenbuettel.de/linux/mandrakelinuxofficial/updates/10.1/RPMS/
+updatesi586:ftp://ftp.fi.muni.cz/pub/linux/mandrakelinuxofficial/updates/10.1/RPMS/
+updatesi586:ftp://ftp.free.fr/mirrors/ftp.mandrake-linux.com/Mandrakelinuxofficial/updates/10.1/RPMS/
+updatesi586:ftp://ftp.fsn.hu/pub/linux/distributions/mandrakeofficial/updates/10.1/RPMS/
+updatesi586:ftp://ftp.gtlib.cc.gatech.edu/pub/mandrakeofficial/updates/10.1/RPMS/
+updatesi586:ftp://ftp.gwdg.de/pub/linux/mandrakelinuxofficial/updates/10.1/RPMS/
+updatesi586:ftp://ftp.icm.edu.pl/pub/linux/mandrakelinuxofficial/updates/10.1/RPMS/
+updatesi586:ftp://ftp.informatik.hu-berlin.de/pub/Linux/Distributions/Mandrake/Mandrakelinuxofficial/updates/10.1/RPMS/
+updatesi586:ftp://ftp.int-evry.fr/pub/linux/mandrakeofficial/updates/10.1/RPMS/
+updatesi586:ftp://ftp.isu.edu.tw/pub/Linux/Mandrakelinuxofficial/updates/10.1/RPMS/
+updatesi586:ftp://ftp.isu.net.sa/pub/mirrors/ftp.mandrake.com/mandrakelinuxofficial/updates/10.1/RPMS/
+updatesi586:ftp://ftp.join.uni-muenster.de/pub/linux/distributions/mandrakelinuxofficial/updates/10.1/RPMS/
+updatesi586:ftp://ftp.kddlabs.co.jp/Linux/packages/Mandrakeofficial/updates/10.1/RPMS/
+updatesi586:ftp://ftp.linux.cz/pub/linux/mandrakelinuxofficial/updates/10.1/RPMS/
+updatesi586:ftp://ftp.lip6.fr/pub/linux/distributions/Mandrakelinuxofficial/updates/10.1/RPMS/
+updatesi586:ftp://ftp.mandrake.ikoula.com/Mandrakelinuxofficial/updates/10.1/RPMS/
+updatesi586:ftp://ftp.mirror.ac.uk/sites/sunsite.uio.no/ftp/linux/mdlofficial/updates/10.1/RPMS/
+updatesi586:ftp://ftp.mirrorservice.org/pub/Mandrake_Linuxofficial/updates/10.1/RPMS/
+updatesi586:ftp://ftp.mki.fh-duesseldorf.de/Mirror/Mandrakeofficial/updates/10.1/RPMS/
+updatesi586:ftp://ftp.ndlug.nd.edu/pub/Mandrakelinux/official/updates/10.1/RPMS/
+updatesi586:ftp://ftp.nectec.or.th/pub/linux-distributions/Mandrakeofficial/updates/10.1/RPMS/
+updatesi586:ftp://ftp.nluug.nl/pub/os/Linux/distr/Mandrakelinuxofficial/updates/10.1/RPMS/
+updatesi586:ftp://ftp.phys.ttu.edu/pub/mandrakelinuxofficial/updates/10.1/RPMS/
+updatesi586:ftp://ftp.proxad.net/pub/Distributions_Linux/Mandrakelinuxofficial/updates/10.1/RPMS/
+updatesi586:ftp://ftp.ps.pl/mirrors/mandrakeofficial/updates/10.1/RPMS/
+updatesi586:ftp://ftp.rediris.es/pub/linux/distributions/mandrakelinuxofficial/updates/10.1/RPMS/
+updatesi586:ftp://ftp.rhnet.is/pub/Mandrakelinuxofficial/updates/10.1/RPMS/
+updatesi586:ftp://ftp.riken.go.jp/pub/Linux/mandrakeofficial/updates/10.1/RPMS/
+updatesi586:ftp://ftp.rutgers.edu/pub/Mandrakelinuxofficial/updates/10.1/RPMS/
+updatesi586:ftp://ftp.sh.cvut.cz/MIRRORS/Mandrake/mandrakeofficial/updates/10.1/RPMS/
+updatesi586:ftp://ftp.song.fi/pub/mirrors/Mandrake-linuxofficial/updates/10.1/RPMS/
+updatesi586:ftp://ftp.sunet.se/pub/Linux/distributions/mandrakelinuxofficial/updates/10.1/RPMS/
+updatesi586:ftp://ftp.sunsite.dk/mirrors/mandrakeofficial/updates/10.1/RPMS/
+updatesi586:ftp://ftp.surfnet.nl/pub/os/Linux/distr/Mandrakelinuxofficial/updates/10.1/RPMS/
+updatesi586:ftp://ftp.task.gda.pl/pub/linux/Mandrakelinuxofficial/updates/10.1/RPMS/
+updatesi586:ftp://ftp.tpnet.pl/d2/Mandrakelinuxofficial/updates/10.1/RPMS/
+updatesi586:ftp://ftp.tu-chemnitz.de/pub/linux/mandrakelinuxofficial/updates/10.1/RPMS/
+updatesi586:ftp://ftp.uasw.edu/linux/mandrakelinuxofficial/updates/10.1/RPMS/
+updatesi586:ftp://ftp.umr.edu/pub/linux/mandrake/Mandrakelinuxofficial/updates/10.1/RPMS/
+updatesi586:ftp://ftp.uni-bayreuth.de/pub/linux/Mandrakelinuxofficial/updates/10.1/RPMS/
+updatesi586:ftp://ftp.uni-wuppertal.de/pub/linux/mandrake/Mandrakelinuxofficial/updates/10.1/RPMS/
+updatesi586:ftp://ftp.unina.it/pub/linux/distributions/Mandrakeofficial/updates/10.1/RPMS/
+updatesi586:ftp://ftp.uvsq.fr/pub/mandrakeofficial/updates/10.1/RPMS/
+updatesi586:ftp://ftp.uwsg.indiana.edu/linux/mandrakeofficial/updates/10.1/RPMS/
+updatesi586:ftp://ftp.vat.tu-dresden.de/pub/Mandrakelinuxofficial/updates/10.1/RPMS/
+updatesi586:ftp://ftp3.mandrake.sk/mirrors/Mandrakelinuxofficial/updates/10.1/RPMS/
+updatesi586:ftp://gd.tuwien.ac.at/pub/linux/Mandrakelinuxofficial/updates/10.1/RPMS/
+updatesi586:ftp://helios.dii.utk.edu/pub/linux/Mandrakeofficial/updates/10.1/RPMS/
+updatesi586:ftp://linux.ntcu.net/dists/mandrakeofficial/updates/10.1/RPMS/
+updatesi586:ftp://linux.ups-tlse.fr/Mandrakelinuxofficial/updates/10.1/RPMS/
+updatesi586:ftp://mandrake.contactel.cz/Mandrakelinuxofficial/updates/10.1/RPMS/
+updatesi586:ftp://mandrake.mirrors.pair.com/Mandrakelinux/official/updates/10.1/RPMS/
+updatesi586:ftp://mdk.linux.org.tw/pub/mandrakelinuxofficial/updates/10.1/RPMS/
+updatesi586:ftp://mirror.cs.wisc.edu/pub/mirrors/linux/Mandrakelinuxofficial/updates/10.1/RPMS/
+updatesi586:ftp://mirror.inspire.net.nz/mandrake/official/updates/10.1/RPMS/
+updatesi586:ftp://mirror.pacific.net.au/linux/Mandrakelinuxofficial/updates/10.1/RPMS/
+updatesi586:ftp://mirror.switch.ch/mirror/mandrakeofficial/updates/10.1/RPMS/
+updatesi586:ftp://mirrors.ptd.net/mandrakeofficial/updates/10.1/RPMS/
+updatesi586:ftp://mirrors.secsup.org/pub/linux/mandrakelinuxofficial/updates/10.1/RPMS/
+updatesi586:ftp://mirrors.xmission.com/mandrakeofficial/updates/10.1/RPMS/
+updatesi586:ftp://ramses.wh2.tu-dresden.de/pub/mirrors/mandrakeofficial/updates/10.1/RPMS/
+updatesi586:ftp://rpm.pbone.net/pub/mandrake/mandrakelinuxofficial/updates/10.1/RPMS/
+updatesi586:ftp://search.belnet.be/packages/mandrakelinuxofficial/updates/10.1/RPMS/
+updatesi586:ftp://sunsite.cnlab-switch.ch/mirror/mandrakeofficial/updates/10.1/RPMS/
+updatesi586:ftp://sunsite.icm.edu.pl/pub/Linux/mandrakelinuxofficial/updates/10.1/RPMS/
+updatesi586:ftp://sunsite.informatik.rwth-aachen.de/pub/Linux/mandrakeofficial/updates/10.1/RPMS/
+updatesi586:ftp://tux.cprm.net/pub/Mandrakeofficial/updates/10.1/RPMS/
+updatesi586:ftp://www.mirror.ac.uk/sites/sunsite.uio.no/ftp/linux/mdlofficial/updates/10.1/RPMS/
diff --git a/perl-install/install_any.pm b/perl-install/install_any.pm
index f5027181d..2ac679a16 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 {
@@ -504,9 +505,10 @@ sub selectSupplMedia {
 		    and $global_ftp_prefix = [ $3, $4, $1, $2 ]; #- for getFile
 	    } else {
 		$url = $o->ask_from_entry('', N("URL of the mirror?")) or return 'error';
+		$url =~ s!/+\z!!;
 	    }
 	    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) };
@@ -514,8 +516,13 @@ sub selectSupplMedia {
 		log::l("psUsingHdlists failed: $@");
 	    } else {
 		#- copy latest compssUsers.pl and rpmsrate somewhere locally
-		getAndSaveFile("$url/media/media_info/compssUsers.pl", "/tmp/compssUsers.pl");
-		getAndSaveFile("$url/media/media_info/rpmsrate", "/tmp/rpmsrate");
+		if ($suppl_method eq 'ftp') {
+		    getAndSaveFile("media/media_info/compssUsers.pl", "/tmp/compssUsers.pl");
+		    getAndSaveFile("media/media_info/rpmsrate", "/tmp/rpmsrate");
+		} else {
+		    getAndSaveFile("$url/media/media_info/compssUsers.pl", "/tmp/compssUsers.pl");
+		    getAndSaveFile("$url/media/media_info/rpmsrate", "/tmp/rpmsrate");
+		}
 		useMedium($prev_asked_medium); #- back to main medium
 		return $suppl_method;
 	    }