Revert "Fixed mirrorlist in ISO overlay"

This reverts commit 645484230e83905348b8c1d1c273bcd9b52cd39d.

Signed-off-by: Gerhard Brauer <gerbra@archlinux.de>
Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>

1 files changed, 72 insertions, 182 deletions

diff --git a/configs/install-iso/overlay/etc/pacman.d/mirrorlist b/configs/install-iso/overlay/etc/pacman.d/mirrorlist
index 16df479..f5110c0 100644
--- a/configs/install-iso/overlay/etc/pacman.d/mirrorlist
+++ b/configs/install-iso/overlay/etc/pacman.d/mirrorlist
@@ -1,223 +1,113 @@
 #
 # Arch Linux repository mirrorlist
-# Generated on 2009-06-16
 #
 
-# Australia
-Server = ftp://mirror.aarnet.edu.au/pub/archlinux/$repo/os/@ARCH@
-Server = http://mirror.aarnet.edu.au/pub/archlinux/$repo/os/@ARCH@
-Server = ftp://ftp.iinet.net.au/pub/archlinux/$repo/os/@ARCH@
-Server = http://ftp.iinet.net.au/pub/archlinux/$repo/os/@ARCH@
-Server = ftp://mirror.internode.on.net/pub/archlinux/$repo/os/@ARCH@
-Server = http://mirror.internode.on.net/pub/archlinux/$repo/os/@ARCH@
-Server = ftp://mirror.pacific.net.au/linux/archlinux/$repo/os/@ARCH@
-Server = http://mirror.pacific.net.au/linux/archlinux/$repo/os/@ARCH@
-
-# Austria
-Server = ftp://gd.tuwien.ac.at/opsys/linux/archlinux/$repo/os/@ARCH@
-Server = http://gd.tuwien.ac.at/opsys/linux/archlinux/$repo/os/@ARCH@
-
-# Belgium
-Server = ftp://ftp.belnet.be/packages/archlinux/$repo/os/@ARCH@
-Server = http://ftp.belnet.be/mirror/archlinux.org/$repo/os/@ARCH@
-
-# Brazil
-Server = ftp://archlinux.c3sl.ufpr.br/archlinux/$repo/os/@ARCH@
-Server = http://archlinux.c3sl.ufpr.br/$repo/os/@ARCH@
-Server = ftp://ftp.las.ic.unicamp.br/pub/archlinux/$repo/os/@ARCH@
-Server = http://www.las.ic.unicamp.br/pub/archlinux/$repo/os/@ARCH@
-Server = http://pet.inf.ufsc.br/mirrors/archlinux/$repo/os/@ARCH@
-
-# Bulgaria
-Server = http://archlinux.igor.onlinedirect.bg/$repo/os/@ARCH@
-
-# Canada
+# North America
+# - United States
+Server = ftp://ftp.archlinux.org/$repo/os/@ARCH@
+Server = ftp://locke.suu.edu/linux/dist/archlinux/$repo/os/@ARCH@
+Server = http://archlinux.unixheads.org/$repo/os/@ARCH@
+Server = ftp://ftp.gtlib.gatech.edu/pub/linux/distributions/archlinux/$repo/os/@ARCH@
+Server = ftp://mirror.cs.vt.edu/pub/ArchLinux/$repo/os/@ARCH@
+Server = http://mirrors.easynews.com/linux/archlinux/$repo/os/@ARCH@
+Server = ftp://ftp.ibiblio.org/pub/linux/distributions/archlinux/$repo/os/@ARCH@
+Server = http://archlinux.umflint.edu/mirrors/archlinux/$repo/os/@ARCH@
+Server = http://mirror.neotuli.net/arch/$repo/os/@ARCH@
+Server = http://mirror.rit.edu/archlinux/$repo/os/@ARCH@
+Server = http://mirror.umoss.org/archlinux/$repo/os/@ARCH@
+Server = http://schlunix.org/archlinux/$repo/os/@ARCH@
+Server = http://mirror.archlinux.com.ve/$repo/os/@ARCH@
+# - Canada
 Server = ftp://mirror.csclub.uwaterloo.ca/archlinux/$repo/os/@ARCH@
-Server = http://mirror.csclub.uwaterloo.ca/archlinux/$repo/os/@ARCH@
 Server = ftp://mirrors.portafixe.com/archlinux/$repo/os/@ARCH@
-Server = http://mirrors.portafixe.com/archlinux/$repo/os/@ARCH@
 
-# Chile
-Server = ftp://mirror.archlinux.cl/$repo/os/@ARCH@
+# South America
+# - Brazil
+Server = http://archlinux.c3sl.ufpr.br/$repo/os/@ARCH@
+Server = ftp://archlinux.c3sl.ufpr.br/archlinux/$repo/os/@ARCH@
+Server = ftp://ftp.las.ic.unicamp.br/pub/archlinux/$repo/os/@ARCH@
+# - Venezuela
+Server = http://mirror2.archlinux.com.ve/$repo/os/@ARCH@
 
-# Czech Republic
+# Europe
+# - Austria
+Server = ftp://gd.tuwien.ac.at/opsys/linux/archlinux/$repo/os/@ARCH@
+# - Belgium
+Server = ftp://ftp.belnet.be/mirror/archlinux.org/$repo/os/@ARCH@
+# - Czech Republic
 Server = ftp://ftp.sh.cvut.cz/MIRRORS/arch/$repo/os/@ARCH@
-Server = http://ftp.sh.cvut.cz/MIRRORS/arch/$repo/os/@ARCH@
-
-# Denmark
-Server = ftp://ftp.klid.dk/archlinux/$repo/os/@ARCH@
-
-# Estonia
+# - Denmark
+Server = ftp://ftp.klid.dk/archlinux/$repo/os/@CARCH@
+# - Estonia
 Server = ftp://ftp.estpak.ee/pub/archlinux/$repo/os/@ARCH@
-Server = http://ftp.estpak.ee/pub/archlinux/$repo/os/@ARCH@
-
-# Finland
-Server = ftp://mirror.archlinux.fi/$repo/os/@ARCH@
-Server = http://mirror.archlinux.fi/$repo/os/@ARCH@
-
-# France
-Server = http://mir.archlinux.fr/$repo/os/@ARCH@
+# - France
 Server = ftp://mir1.archlinuxfr.org/archlinux/$repo/os/@ARCH@
 Server = ftp://mir2.archlinuxfr.org/archlinux/$repo/os/@ARCH@
-Server = http://mir1.archlinuxfr.org/archlinux/$repo/os/@ARCH@
-Server = http://mir2.archlinuxfr.org/archlinux/$repo/os/@ARCH@
 Server = ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/archlinux/$repo/os/@ARCH@
-Server = http://distrib-coffee.ipsl.jussieu.fr/pub/linux/archlinux/$repo/os/@ARCH@
+Server = http://mir.archlinux.fr/$repo/os/@ARCH@
 Server = ftp://ftp.free.fr/mirrors/ftp.archlinux.org/$repo/os/@ARCH@
 Server = ftp://ftp.rez-gif.supelec.fr/Linux/archlinux/$repo/os/@ARCH@
-
-# Germany
-Server = ftp://ftp.archlinuxppc.org/@ARCH@/$repo/os/i686
-Server = ftp://ftp5.gwdg.de/pub/linux/archlinux/$repo/os/@ARCH@
-Server = http://ftp5.gwdg.de/pub/linux/archlinux/$repo/os/@ARCH@
+# - Germany
 Server = ftp://ftp.hosteurope.de/mirror/ftp.archlinux.org/$repo/os/@ARCH@
-Server = http://ftp.hosteurope.de/mirror/ftp.archlinux.org/$repo/os/@ARCH@
-Server = ftp://ftp-stud.hs-esslingen.de/pub/Mirrors/archlinux/$repo/os/@ARCH@
-Server = http://ftp-stud.hs-esslingen.de/pub/Mirrors/archlinux/$repo/os/@ARCH@
-Server = ftp://ftp.spline.inf.fu-berlin.de/mirrors/archlinux/$repo/os/@ARCH@
-Server = http://ftp.spline.inf.fu-berlin.de/mirrors/archlinux/$repo/os/@ARCH@
-Server = ftp://ftp.tu-chemnitz.de/pub/linux/archlinux/$repo/os/@ARCH@
-Server = http://ftp.tu-chemnitz.de/pub/linux/archlinux/$repo/os/@ARCH@
+Server = ftp://ftp5.gwdg.de/pub/linux/archlinux/$repo/os/@ARCH@
 Server = ftp://ftp.uni-bayreuth.de/pub/linux/archlinux/$repo/os/@ARCH@
-Server = http://ftp.uni-bayreuth.de/linux/archlinux/$repo/os/@ARCH@
-Server = ftp://ftp.uni-kl.de/pub/linux/archlinux/$repo/os/@ARCH@
+Server = ftp://ftp.archlinuxppc.org/@ARCH@/$repo/os/@ARCH@
+Server = ftp://ftp.tu-chemnitz.de/pub/linux/archlinux/$repo/os/@ARCH@
 Server = http://ftp.uni-kl.de/pub/linux/archlinux/$repo/os/@ARCH@
-Server = ftp://ftp.wh-stuttgart.net/archlinux/$repo/os/@ARCH@
-
-# Great Britain
-Server = ftp://mirror.lividpenguin.com/pub/archlinux/$repo/os/@ARCH@
-Server = http://mirror.lividpenguin.com/pub/archlinux/$repo/os/@ARCH@
+Server = http://mirrors.igprolin-online.org/pub/archlinux/$repo/os/@ARCH@
+Server = ftp://ftp-stud.hs-esslingen.de/pub/Mirrors/archlinux/$repo/os/@ARCH@
+# - Great Britain
 Server = http://www.mirrorservice.org/sites/ftp.archlinux.org/$repo/os/@ARCH@
 Server = ftp://mirrors.uk2.net/pub/archlinux/$repo/os/@ARCH@
 Server = http://archlinux.mirrors.uk2.net/$repo/os/@ARCH@
-
-# Greece
+# - Greece
 Server = ftp://ftp.ntua.gr/pub/linux/archlinux/$repo/os/@ARCH@
-Server = http://ftp.ntua.gr/pub/linux/archlinux/$repo/os/@ARCH@
-Server = ftp://ftp.otenet.gr/pub/linux/archlinux/$repo/os/@ARCH@
-Server = http://ftp.otenet.gr/linux/archlinux/$repo/os/@ARCH@
-
-# Hungary
+# - Hungary
 Server = ftp://ftp.mfa.kfki.hu/pub/mirrors/ftp.archlinux.org/$repo/os/@ARCH@
-
-# Indonesia
-Server = ftp://archlinux.cbn.net.id/pub/archlinux/$repo/os/@ARCH@
-Server = http://archlinux.cbn.net.id/$repo/os/@ARCH@
-Server = ftp://mirror.unej.ac.id/archlinux/$repo/os/@ARCH@
-Server = http://mirror.unej.ac.id/archlinux/$repo/os/@ARCH@
-
-# Ireland
+# - Ireland
 Server = ftp://ftp.heanet.ie/mirrors/ftp.archlinux.org/$repo/os/@ARCH@
-Server = http://ftp.heanet.ie/mirrors/ftp.archlinux.org/$repo/os/@ARCH@
-
-# Israel
-Server = http://mirror.isoc.org.il/pub/archlinux/$repo/os/@ARCH@
-
-# Italy
+# - Italy
 Server = ftp://mi.mirror.garr.it/mirrors/archlinux/$repo/os/@ARCH@
-Server = http://mi.mirror.garr.it/mirrors/archlinux/$repo/os/@ARCH@
-
-# Japan
-Server = ftp://ftp.yz.yamagata-u.ac.jp/pub/linux/archlinux/$repo/os/@ARCH@
-Server = http://ftp.yz.yamagata-u.ac.jp/pub/linux/archlinux/$repo/os/@ARCH@
-
-# Latvia
-Server = http://archlinux.goodsoft.lv/$repo/os/@ARCH@
-
-# Lithuania
-Server = ftp://atviras.lt/archmirror/$repo/os/@ARCH@
-Server = http://atviras.lt/archmirror/$repo/os/@ARCH@
-
-# Netherlands
-Server = ftp://mirror.leaseweb.com/archlinux/$repo/os/@ARCH@
-Server = http://mirror.leaseweb.com/archlinux/$repo/os/@ARCH@
+# - Netherlands
 Server = ftp://ftp.nluug.nl/pub/metalab/distributions/archlinux/$repo/os/@ARCH@
-Server = http://ftp.nluug.nl/pub/metalab/distributions/archlinux/$repo/os/@ARCH@
 Server = ftp://ftp.surfnet.nl/pub/os/Linux/distr/archlinux/$repo/os/@ARCH@
-Server = http://ftp.surfnet.nl/pub/os/Linux/distr/archlinux/$repo/os/@ARCH@
-
-# New Caledonia
-Server = ftp://archlinux.nautile.nc/archlinux/$repo/os/@ARCH@
-Server = http://archlinux.nautile.nc/archlinux/$repo/os/@ARCH@
-
-# Norway
-Server = ftp://mirror.archlinux.no/$repo/os/@ARCH@
-Server = http://mirror.archlinux.no/$repo/os/@ARCH@
-
-# Poland
+# - Norway
+Server = http://mirror.archlinux.no/$repo/os/@carch
+# - Poland
 Server = ftp://mirror.icis.pcz.pl/archlinux/$repo/os/@ARCH@
-Server = ftp://ftp.piotrkosoft.net/pub/mirrors/ftp.archlinux.org/$repo/os/@ARCH@
 Server = http://piotrkosoft.net/pub/mirrors/ftp.archlinux.org/$repo/os/@ARCH@
-Server = ftp://ftp.pwsz.elblag.pl/pub/linux/distributions/archlinux/$repo/os/@ARCH@
-Server = http://ftp.pwsz.elblag.pl/pub/linux/distributions/archlinux/$repo/os/@ARCH@
+Server = ftp://ftp.piotrkosoft.net/pub/mirrors/ftp.archlinux.org/$repo/os/@ARCH@
 Server = http://unix.net.pl/archlinux.org/$repo/os/@ARCH@
-
-# Portugal
+# - Portugal
 Server = ftp://cesium.di.uminho.pt/pub/archlinux/$repo/os/@ARCH@
-Server = http://cesium.di.uminho.pt/pub/archlinux/$repo/os/@ARCH@
-Server = http://darkstar.ist.utl.pt/archlinux/$repo/os/@ARCH@
-Server = ftp://ftp.nux.ipb.pt/pub/dists/archlinux/$repo/os/@ARCH@
-Server = http://ftp.nux.ipb.pt/pub/dists/archlinux/$repo/os/@ARCH@
-
-# Romania
+# - Romania
 Server = ftp://ftp.iasi.roedu.net/mirrors/archlinux.org/$repo/os/@ARCH@
-Server = http://ftp.iasi.roedu.net/mirrors/archlinux.org/$repo/os/@ARCH@
-
-# Russia
-Server = http://archlinux.freeside.ru/$repo/os/@ARCH@
-Server = ftp://mirror.svk.su/archlinux/$repo/os/@ARCH@
-Server = http://mirror.svk.su/archlinux/$repo/os/@ARCH@
+# - Russia
 Server = ftp://mirror.yandex.ru/archlinux/$repo/os/@ARCH@
-Server = http://mirror.yandex.ru/archlinux/$repo/os/@ARCH@
-
-# Sweden
+Server = http://archlinux.freeside.ru/$repo/os/@ARCH@
+# - Sweden
 Server = ftp://ftp.ds.hj.se/pub/os/linux/archlinux/$repo/os/@ARCH@
-Server = http://ftp.ds.hj.se/pub/os/linux/archlinux/$repo/os/@ARCH@
 Server = ftp://ftp.gigabit.nu/$repo/os/@ARCH@
-Server = http://ftp.gigabit.nu/$repo/os/@ARCH@
-
-# Switzerland
-Server = ftp://archlinux.puzzle.ch/$repo/os/@ARCH@
+# - Switzerland
 Server = http://archlinux.puzzle.ch/$repo/os/@ARCH@
-
-# Turkey
-Server = ftp://ftp.linux.org.tr/archlinux/$repo/os/@ARCH@
-
-# Ukraine
+# - Turkey
+Server = ftp://ftp.linux.org.tr/pub/mirrors/archlinux/$repo/os/@ARCH@
+# - Ukraine
 Server = ftp://archlinux.hell.org.ua/archlinux/$repo/os/@ARCH@
-Server = http://archlinux.hell.org.ua/archlinux/$repo/os/@ARCH@
 Server = ftp://ftp.linux.kiev.ua/pub/Linux/ArchLinux/$repo/os/@ARCH@
-Server = http://ftp.linux.kiev.ua/pub/Linux/ArchLinux/$repo/os/@ARCH@
-
-# United States
-Server = http://mirror.archlinux.com.ve/$repo/os/@ARCH@
-Server = http://archlinux.unixheads.org/$repo/os/@ARCH@
-Server = ftp://mirror.cs.vt.edu/pub/ArchLinux/$repo/os/@ARCH@
-Server = http://mirror.cs.vt.edu/pub/ArchLinux/$repo/os/@ARCH@
-Server = ftp://mirrors.easynews.com/linux/archlinux/$repo/os/@ARCH@
-Server = http://mirrors.easynews.com/linux/archlinux/$repo/os/@ARCH@
-Server = ftp://ftp.archlinux.org/$repo/os/@ARCH@
-Server = http://mirrors.gigenet.com/archlinux/$repo/os/@ARCH@
-Server = ftp://ftp.gtlib.gatech.edu/pub/linux/distributions/archlinux/$repo/os/@ARCH@
-Server = http://www.gtlib.gatech.edu/pub/linux/distributions/archlinux/$repo/os/@ARCH@
-Server = ftp://mirrors.hosef.org/archlinux/$repo/os/@ARCH@
-Server = http://mirrors.hosef.org/archlinux/$repo/os/@ARCH@
-Server = ftp://ibiblio.org/pub/linux/distributions/archlinux/$repo/os/@ARCH@
-Server = http://distro.ibiblio.org/pub/linux/distributions/archlinux/$repo/os/@ARCH@
-Server = ftp://locke.suu.edu/linux/dist/archlinux/$repo/os/@ARCH@
-Server = ftp://mirror.rit.edu/archlinux/$repo/os/@ARCH@
-Server = http://mirror.rit.edu/archlinux/$repo/os/@ARCH@
-Server = http://schlunix.org/archlinux/$repo/os/@ARCH@
-Server = http://mirror.sourceshare.org/archlinux/$repo/os/@ARCH@
-Server = http://archlinux.umflint.edu/$repo/os/@ARCH@
-Server = http://mirror.umoss.org/archlinux/$repo/os/@ARCH@
-
-# Venezuela
-Server = http://mirror2.archlinux.com.ve/$repo/os/@ARCH@
 
-# Vietnam
+# Asia
+# - Indonesia
+Server = http://archlinux.cbn.net.id/$repo/os/@ARCH@
+Server = ftp://archlinux.cbn.net.id/pub/archlinux/$repo/os/@ARCH@
+# - Israel
+Server = http://mirror.isoc.org.il/pub/archlinux/$repo/os/@ARCH@
+# - Vietnam
+# Domain name is ftp.indochinalinux.com but there are frequent DNS problems
 Server = ftp://202.78.230.5/archlinux/$repo/os/@ARCH@
-Server = ftp://ftp.indochinalinux.com/archlinux/$repo/os/@ARCH@
-Server = ftp://mirror-fpt-telecom.fpt.net/archlinux/$repo/os/@ARCH@
-Server = http://mirror-fpt-telecom.fpt.net/archlinux/$repo/os/@ARCH@
+
+# Australia
+Server = ftp://mirror.pacific.net.au/linux/archlinux/$repo/os/@ARCH@
+Server = ftp://mirror.aarnet.edu.au/pub/archlinux/$repo/os/@ARCH@
+Server = ftp://ftp.iinet.net.au/pub/archlinux/$repo/os/@ARCH@