From 90ac2f5dd948412ac31aa3d35bbb76223ebaaf98 Mon Sep 17 00:00:00 2001 From: Gerhard Brauer Date: Fri, 24 Jul 2009 19:03:14 +0200 Subject: [PATCH] Let the mirrorlist in overlay generate dynamically Removed mirrorlist file from overlay and modified Makefile to fetch the file dynamically on iso creation (Thanks, Dan!) Signed-off-by: Gerhard Brauer Signed-off-by: Aaron Griffin --- configs/install-iso/Makefile | 3 +- .../overlay/etc/pacman.d/mirrorlist | 113 ------------------ 2 files changed, 2 insertions(+), 114 deletions(-) delete mode 100644 configs/install-iso/overlay/etc/pacman.d/mirrorlist diff --git a/configs/install-iso/Makefile b/configs/install-iso/Makefile index cfdf6e6..fad177c 100644 --- a/configs/install-iso/Makefile +++ b/configs/install-iso/Makefile @@ -32,7 +32,8 @@ ftp-iso: overlay $(BOOTLOADER) overlay: base-iso cp -r overlay $(WORKDIR)/ - sed -i "s|@ARCH@|$(ARCH)|g" "$(WORKDIR)/overlay/etc/pacman.d/mirrorlist" + wget -O $(WORKDIR)/overlay/etc/pacman.d/mirrorlist http://www.archlinux.org/mirrorlist/$(ARCH)/all/ + sed -i "s/#Server/Server/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 deleted file mode 100644 index f5110c0..0000000 --- a/configs/install-iso/overlay/etc/pacman.d/mirrorlist +++ /dev/null @@ -1,113 +0,0 @@ -# -# Arch Linux repository mirrorlist -# - -# 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 = ftp://mirrors.portafixe.com/archlinux/$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@ - -# 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@ -# - Denmark -Server = ftp://ftp.klid.dk/archlinux/$repo/os/@CARCH@ -# - Estonia -Server = ftp://ftp.estpak.ee/pub/archlinux/$repo/os/@ARCH@ -# - France -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/@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/@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/@ARCH@ -# - Hungary -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/@ARCH@ -# - Italy -Server = ftp://mi.mirror.garr.it/mirrors/archlinux/$repo/os/@ARCH@ -# - Netherlands -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/@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/@ARCH@ -# - Romania -Server = ftp://ftp.iasi.roedu.net/mirrors/archlinux.org/$repo/os/@ARCH@ -# - Russia -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/@ARCH@ -Server = ftp://ftp.gigabit.nu/$repo/os/@ARCH@ -# - Switzerland -Server = http://archlinux.puzzle.ch/$repo/os/@ARCH@ -# - 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 = ftp://ftp.linux.kiev.ua/pub/Linux/ArchLinux/$repo/os/@ARCH@ - -# 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@ - -# 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@ -