Change mirrorlist architecture on make

The x86_64 images were installing i686 systems. This
was due to the fact that the mirrorlist was in the overlay.

A new devtools release (with the -n arg) will fix this when
running mkarchroot. To be removed later

Signed-off-by: Aaron Griffin <aaronmgriffin@gmail.com>

2 files changed, 68 insertions, 67 deletions

diff --git a/configs/install-iso/Makefile b/configs/install-iso/Makefile
index 2b6d7f3..20cb367 100644
--- a/configs/install-iso/Makefile
+++ b/configs/install-iso/Makefile
@@ -33,6 +33,7 @@ ftp-iso: overlay $(BOOTLOADER)
 
 overlay: base-iso
 	cp -r overlay $(WORKDIR)/
+	sed -i "s|@ARCH@|$(ARCH)|g" "$(WORKDIR)/overlay/etc/pacman.d/mirrorlist"
 
 root-image:
 	mkarchiso -p $(PACKAGES) create $(WORKDIR)
diff --git a/configs/install-iso/overlay/etc/pacman.d/mirrorlist b/configs/install-iso/overlay/etc/pacman.d/mirrorlist
index 60a87cc..f5110c0 100644
--- a/configs/install-iso/overlay/etc/pacman.d/mirrorlist
+++ b/configs/install-iso/overlay/etc/pacman.d/mirrorlist
@@ -4,110 +4,110 @@
 
 # North America
 # - United States
-Server = ftp://ftp.archlinux.org/$repo/os/i686
-Server = ftp://locke.suu.edu/linux/dist/archlinux/$repo/os/i686
-Server = http://archlinux.unixheads.org/$repo/os/i686
-Server = ftp://ftp.gtlib.gatech.edu/pub/linux/distributions/archlinux/$repo/os/i686
-Server = ftp://mirror.cs.vt.edu/pub/ArchLinux/$repo/os/i686
-Server = http://mirrors.easynews.com/linux/archlinux/$repo/os/i686
-Server = ftp://ftp.ibiblio.org/pub/linux/distributions/archlinux/$repo/os/i686
-Server = http://archlinux.umflint.edu/mirrors/archlinux/$repo/os/i686
-Server = http://mirror.neotuli.net/arch/$repo/os/i686
-Server = http://mirror.rit.edu/archlinux/$repo/os/i686
-Server = http://mirror.umoss.org/archlinux/$repo/os/i686
-Server = http://schlunix.org/archlinux/$repo/os/i686
-Server = http://mirror.archlinux.com.ve/$repo/os/i686
+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/i686
-Server = ftp://mirrors.portafixe.com/archlinux/$repo/os/i686
+Server = ftp://mirror.csclub.uwaterloo.ca/archlinux/$repo/os/@ARCH@
+Server = ftp://mirrors.portafixe.com/archlinux/$repo/os/@ARCH@
 
 # South America
 # - Brazil
-Server = http://archlinux.c3sl.ufpr.br/$repo/os/i686
-Server = ftp://archlinux.c3sl.ufpr.br/archlinux/$repo/os/i686
-Server = ftp://ftp.las.ic.unicamp.br/pub/archlinux/$repo/os/i686
+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/i686
+Server = http://mirror2.archlinux.com.ve/$repo/os/@ARCH@
 
 # Europe
 # - Austria
-Server = ftp://gd.tuwien.ac.at/opsys/linux/archlinux/$repo/os/i686
+Server = ftp://gd.tuwien.ac.at/opsys/linux/archlinux/$repo/os/@ARCH@
 # - Belgium
-Server = ftp://ftp.belnet.be/mirror/archlinux.org/$repo/os/i686
+Server = ftp://ftp.belnet.be/mirror/archlinux.org/$repo/os/@ARCH@
 # - Czech Republic
-Server = ftp://ftp.sh.cvut.cz/MIRRORS/arch/$repo/os/i686
+Server = ftp://ftp.sh.cvut.cz/MIRRORS/arch/$repo/os/@ARCH@
 # - Denmark
 Server = ftp://ftp.klid.dk/archlinux/$repo/os/@CARCH@
 # - Estonia
-Server = ftp://ftp.estpak.ee/pub/archlinux/$repo/os/i686
+Server = ftp://ftp.estpak.ee/pub/archlinux/$repo/os/@ARCH@
 # - France
-Server = ftp://mir1.archlinuxfr.org/archlinux/$repo/os/i686
-Server = ftp://mir2.archlinuxfr.org/archlinux/$repo/os/i686
-Server = ftp://distrib-coffee.ipsl.jussieu.fr/pub/linux/archlinux/$repo/os/i686
-Server = http://mir.archlinux.fr/$repo/os/i686
-Server = ftp://ftp.free.fr/mirrors/ftp.archlinux.org/$repo/os/i686
-Server = ftp://ftp.rez-gif.supelec.fr/Linux/archlinux/$repo/os/i686
+Server = ftp://mir1.archlinuxfr.org/archlinux/$repo/os/@ARCH@
+Server = ftp://mir2.archlinuxfr.org/archlinux/$repo/os/@ARCH@
+Server = ftp://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.hosteurope.de/mirror/ftp.archlinux.org/$repo/os/i686
-Server = ftp://ftp5.gwdg.de/pub/linux/archlinux/$repo/os/i686
-Server = ftp://ftp.uni-bayreuth.de/pub/linux/archlinux/$repo/os/i686
-Server = ftp://ftp.archlinuxppc.org/i686/$repo/os/i686
-Server = ftp://ftp.tu-chemnitz.de/pub/linux/archlinux/$repo/os/i686
-Server = http://ftp.uni-kl.de/pub/linux/archlinux/$repo/os/i686
-Server = http://mirrors.igprolin-online.org/pub/archlinux/$repo/os/i686
-Server = ftp://ftp-stud.hs-esslingen.de/pub/Mirrors/archlinux/$repo/os/i686
+Server = ftp://ftp.hosteurope.de/mirror/ftp.archlinux.org/$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 = 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 = 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/i686
-Server = ftp://mirrors.uk2.net/pub/archlinux/$repo/os/i686
-Server = http://archlinux.mirrors.uk2.net/$repo/os/i686
+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
-Server = ftp://ftp.ntua.gr/pub/linux/archlinux/$repo/os/i686
+Server = ftp://ftp.ntua.gr/pub/linux/archlinux/$repo/os/@ARCH@
 # - Hungary
-Server = ftp://ftp.mfa.kfki.hu/pub/mirrors/ftp.archlinux.org/$repo/os/i686
+Server = ftp://ftp.mfa.kfki.hu/pub/mirrors/ftp.archlinux.org/$repo/os/@ARCH@
 # - Ireland
-Server = ftp://ftp.heanet.ie/mirrors/ftp.archlinux.org/$repo/os/i686
+Server = ftp://ftp.heanet.ie/mirrors/ftp.archlinux.org/$repo/os/@ARCH@
 # - Italy
-Server = ftp://mi.mirror.garr.it/mirrors/archlinux/$repo/os/i686
+Server = ftp://mi.mirror.garr.it/mirrors/archlinux/$repo/os/@ARCH@
 # - Netherlands
-Server = ftp://ftp.nluug.nl/pub/metalab/distributions/archlinux/$repo/os/i686
-Server = ftp://ftp.surfnet.nl/pub/os/Linux/distr/archlinux/$repo/os/i686
+Server = ftp://ftp.nluug.nl/pub/metalab/distributions/archlinux/$repo/os/@ARCH@
+Server = ftp://ftp.surfnet.nl/pub/os/Linux/distr/archlinux/$repo/os/@ARCH@
 # - Norway
 Server = http://mirror.archlinux.no/$repo/os/@carch
 # - Poland
-Server = ftp://mirror.icis.pcz.pl/archlinux/$repo/os/i686
-Server = http://piotrkosoft.net/pub/mirrors/ftp.archlinux.org/$repo/os/i686
-Server = ftp://ftp.piotrkosoft.net/pub/mirrors/ftp.archlinux.org/$repo/os/i686
-Server = http://unix.net.pl/archlinux.org/$repo/os/i686
+Server = ftp://mirror.icis.pcz.pl/archlinux/$repo/os/@ARCH@
+Server = http://piotrkosoft.net/pub/mirrors/ftp.archlinux.org/$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
-Server = ftp://cesium.di.uminho.pt/pub/archlinux/$repo/os/i686
+Server = ftp://cesium.di.uminho.pt/pub/archlinux/$repo/os/@ARCH@
 # - Romania
-Server = ftp://ftp.iasi.roedu.net/mirrors/archlinux.org/$repo/os/i686
+Server = ftp://ftp.iasi.roedu.net/mirrors/archlinux.org/$repo/os/@ARCH@
 # - Russia
-Server = ftp://mirror.yandex.ru/archlinux/$repo/os/i686
-Server = http://archlinux.freeside.ru/$repo/os/i686
+Server = ftp://mirror.yandex.ru/archlinux/$repo/os/@ARCH@
+Server = http://archlinux.freeside.ru/$repo/os/@ARCH@
 # - Sweden
-Server = ftp://ftp.ds.hj.se/pub/os/linux/archlinux/$repo/os/i686
-Server = ftp://ftp.gigabit.nu/$repo/os/i686
+Server = ftp://ftp.ds.hj.se/pub/os/linux/archlinux/$repo/os/@ARCH@
+Server = ftp://ftp.gigabit.nu/$repo/os/@ARCH@
 # - Switzerland
-Server = http://archlinux.puzzle.ch/$repo/os/i686
+Server = http://archlinux.puzzle.ch/$repo/os/@ARCH@
 # - Turkey
-Server = ftp://ftp.linux.org.tr/pub/mirrors/archlinux/$repo/os/i686
+Server = ftp://ftp.linux.org.tr/pub/mirrors/archlinux/$repo/os/@ARCH@
 # - Ukraine
-Server = ftp://archlinux.hell.org.ua/archlinux/$repo/os/i686
-Server = ftp://ftp.linux.kiev.ua/pub/Linux/ArchLinux/$repo/os/i686
+Server = ftp://archlinux.hell.org.ua/archlinux/$repo/os/@ARCH@
+Server = ftp://ftp.linux.kiev.ua/pub/Linux/ArchLinux/$repo/os/@ARCH@
 
 # Asia
 # - Indonesia
-Server = http://archlinux.cbn.net.id/$repo/os/i686
-Server = ftp://archlinux.cbn.net.id/pub/archlinux/$repo/os/i686
+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/i686
+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/i686
+Server = ftp://202.78.230.5/archlinux/$repo/os/@ARCH@
 
 # Australia
-Server = ftp://mirror.pacific.net.au/linux/archlinux/$repo/os/i686
-Server = ftp://mirror.aarnet.edu.au/pub/archlinux/$repo/os/i686
-Server = ftp://ftp.iinet.net.au/pub/archlinux/$repo/os/i686
+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@