[arch-releng] [archiso-PATCH] cleanup the mirrorlist handling in overlay
Found a better way to get a actual working mirrorlist into our ISO/Images. Regards Gerhard
This reverts commit 645484230e83905348b8c1d1c273bcd9b52cd39d. --- .../install-iso/overlay/etc/pacman.d/mirrorlist | 254 ++++++-------------- 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@ -- 1.6.3.3
Removed mirrorlist file from overlay and modified Makefile to fetch the file dynamically on iso creation (Thanks, Dan!) Signed-off-by: Gerhard Brauer <gerbra@archlinux.de> --- configs/install-iso/Makefile | 3 +- .../install-iso/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 9badb24..5cabc64 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@ - -- 1.6.3.3
On Sun, Jul 5, 2009 at 3:39 AM, Gerhard Brauer<gerbra@archlinux.de> wrote:
Removed mirrorlist file from overlay and modified Makefile to fetch the file dynamically on iso creation (Thanks, Dan!)
What if we also had an option to fetch it at runtime of the ISO as well? -Dan
Am Sonntag, den 05.07.2009, 18:47 -0500 schrieb Dan McGee:
On Sun, Jul 5, 2009 at 3:39 AM, Gerhard Brauer<gerbra@archlinux.de> wrote:
Removed mirrorlist file from overlay and modified Makefile to fetch the file dynamically on iso creation (Thanks, Dan!)
What if we also had an option to fetch it at runtime of the ISO as well?
Hmm, in the live-cd environment this is possible with pacman -S pacman-mirrorlist (ok, you get *.pacnew and must activate/deactivate mirrors by hand....). But maybe we make a wrapper script for do that: wget the actual mirrorlist file, make via sed all mirrors active. IMHO we could not do that automatically cause we don't know when network is set up. This is a nice thought maybe for the installer. aif could possible do that when the user select the net-install source (ftp/http)....
-Dan
Gerhard
On Sun, 5 Jul 2009 18:47:17 -0500 Dan McGee <dpmcgee@gmail.com> wrote:
On Sun, Jul 5, 2009 at 3:39 AM, Gerhard Brauer<gerbra@archlinux.de> wrote:
Removed mirrorlist file from overlay and modified Makefile to fetch the file dynamically on iso creation (Thanks, Dan!)
What if we also had an option to fetch it at runtime of the ISO as well?
-Dan
Do you mean that a user would boot up the liveCD/usb stick and a script would run that fetches a mirrorlist file from the interwebs? (or updates the mirrorlist package automatically?). Seems quite dirty to me, and won't work for networkless systems. Besides why would we even need that? mirrorlist files don't become outdated that fast? Dieter
On Mon, Jul 6, 2009 at 3:20 AM, Dieter Plaetinck<dieter@plaetinck.be> wrote:
On Sun, 5 Jul 2009 18:47:17 -0500 Dan McGee <dpmcgee@gmail.com> wrote:
On Sun, Jul 5, 2009 at 3:39 AM, Gerhard Brauer<gerbra@archlinux.de> wrote:
Removed mirrorlist file from overlay and modified Makefile to fetch the file dynamically on iso creation (Thanks, Dan!)
What if we also had an option to fetch it at runtime of the ISO as well?
-Dan
Do you mean that a user would boot up the liveCD/usb stick and a script would run that fetches a mirrorlist file from the interwebs? (or updates the mirrorlist package automatically?). Seems quite dirty to me, and won't work for networkless systems.
Why would you ever want to do this on a networkless system? That doesn't make any sense at all. If you are doing a install from a full core CD, you have no need for a network connection and a new mirrorlist. However, for everyone doing a FTP install, networking is kind of required. So no- nothing to do with booting and fetching, but during the FTP install process.
Besides why would we even need that? mirrorlist files don't become outdated that fast?
Not necessarily outdated, but missing mirrors. And you'd be surprised at the mirror turnover we do have. On another note related to Australia's mirrors being listed first- there is a reason they are all commented out by default, so as not to shoulder the burden on any one particular mirrror. I'd rather we find a way to do this same sort of thing on the ISO as well. Any sort of mirror selection procedure should work just fine, as long as the user has to make an *explicit* choice, meaning they can't just use a default (which 99% of people wouldn't change so that wouldn't be very helpful). -Dan
On Mon, 6 Jul 2009 07:33:11 -0500 Dan McGee <dpmcgee@gmail.com> wrote:
On Mon, Jul 6, 2009 at 3:20 AM, Dieter Plaetinck<dieter@plaetinck.be> wrote:
On Sun, 5 Jul 2009 18:47:17 -0500 Dan McGee <dpmcgee@gmail.com> wrote:
On Sun, Jul 5, 2009 at 3:39 AM, Gerhard Brauer<gerbra@archlinux.de> wrote:
Removed mirrorlist file from overlay and modified Makefile to fetch the file dynamically on iso creation (Thanks, Dan!)
What if we also had an option to fetch it at runtime of the ISO as well?
-Dan
Do you mean that a user would boot up the liveCD/usb stick and a script would run that fetches a mirrorlist file from the interwebs? (or updates the mirrorlist package automatically?). Seems quite dirty to me, and won't work for networkless systems.
Why would you ever want to do this on a networkless system? That doesn't make any sense at all. If you are doing a install from a full core CD, you have no need for a network connection and a new mirrorlist. However, for everyone doing a FTP install, networking is kind of required. I agree with that. But people can also use ftp iso's as rescue media, and hence could be without networking. My point was just that it would be awkward to try to (automatically) update the file behind the users back. After all, the mirrorlist is packaged for a reason. If the user wants to update it, the solution is to use pacman imho.
So no- nothing to do with booting and fetching, but during the FTP install process.
Besides why would we even need that? mirrorlist files don't become outdated that fast?
Not necessarily outdated, but missing mirrors. And you'd be surprised at the mirror turnover we do have.
Will this become such a problem, given we are now doing snapshots +/- every 6 months, and the long term goal is 3 months? Maybe the best thing is to update the mirrorlist package during the network installation procedure (optionally asking confirmation from the user)
On another note related to Australia's mirrors being listed first- there is a reason they are all commented out by default, so as not to shoulder the burden on any one particular mirrror. I'd rather we find a way to do this same sort of thing on the ISO as well. Any sort of mirror selection procedure should work just fine, as long as the user has to make an *explicit* choice, meaning they can't just use a default (which 99% of people wouldn't change so that wouldn't be very helpful).
So on the iso we have the choice: 1) leave all mirrors commented out. In aif "force" users to pick a mirror, and maybe for each login shell that opens, put a gentle reminder that the user will need to pick a mirror if he wants to use pacman on the command line. 2) since it's impossible to pick a "one size fits all" default, pick archlinux.org as default, which is more or less okay as this mirror is throttled, so it all works by default, albeit at a slower speed. (2) has the problem of being slow if a user forgets to pick a mirror, so we may put the notes as described in (1). I think that would be a good compromise. Especially since aif currently already motivates the user to choose a specific mirror. Also, both these problems would solve themselves if we would use mirrorbrain ( http://www.archlinux.org/pipermail/pacman-dev/2009-March/008422.html )
-Dan
Dieter
Am Sonntag, den 05.07.2009, 10:39 +0200 schrieb Gerhard Brauer:
Found a better way to get a actual working mirrorlist into our ISO/Images.
Question: should we place ftp.archlinux.org mirror on top of the generated mirrorlist? Currently the fetched mirrorlist is sorted by country, so an Australian mirror is on top. This is normally not a real problem if someone uses pacman in live-CD mode (aif installer ask the user which mirror should be used during web-install from this list). So what you opinions? Pushing archlinux.org mirror although we would avoid using this host? Or live with: first-in = first-use, a experienced arch user IMHO think to check the mirrorlist and push his preferenced mirror... Regards Gerhard
On Sun, 05 Jul 2009 11:24:25 +0200 Gerhard Brauer <gerbra@archlinux.de> wrote:
Am Sonntag, den 05.07.2009, 10:39 +0200 schrieb Gerhard Brauer:
Found a better way to get a actual working mirrorlist into our ISO/Images.
Question: should we place ftp.archlinux.org mirror on top of the generated mirrorlist?
Currently the fetched mirrorlist is sorted by country, so an Australian mirror is on top. This is normally not a real problem if someone uses pacman in live-CD mode (aif installer ask the user which mirror should be used during web-install from this list).
So what you opinions? Pushing archlinux.org mirror although we would avoid using this host? Or live with: first-in = first-use, a experienced arch user IMHO think to check the mirrorlist and push his preferenced mirror...
Regards Gerhard
Well, I would stick with archlinux.org It's basically impossible to set a good default because arch users are all over the world. So they have to change it anyway. And if they don't change it, then they get "punised" for ignoring our recommendations by having very slow downloads ;) So, I propose: mirrorlist in image == mirrorlist from package, but uncommented archlinux.org I'm however not sure if it's possible to use a different mirrorlist file then the one that was used during building. Dieter
participants (3)
-
Dan McGee
-
Dieter Plaetinck
-
Gerhard Brauer