From cbe1a140500b0385faba12caf79b655795e546a2 Mon Sep 17 00:00:00 2001 From: Gerhard Brauer Date: Tue, 30 Dec 2008 04:50:26 +0100 Subject: [PATCH] Add pacman files to overlay Clean pacman.d/mirrorlist and pacman.conf. Otherwise the files from the ISO builder's machine are used (which maybe not clean sometimes). Signed-off-by: Gerhard Brauer [Aaron: Removed packages.list changes] Signed-off-by: Aaron Griffin --- configs/install-iso/overlay/etc/pacman.conf | 77 ++++++++++++ .../overlay/etc/pacman.d/mirrorlist | 113 ++++++++++++++++++ configs/install-iso/packages.list | 2 - 3 files changed, 190 insertions(+), 2 deletions(-) create mode 100644 configs/install-iso/overlay/etc/pacman.conf create mode 100644 configs/install-iso/overlay/etc/pacman.d/mirrorlist diff --git a/configs/install-iso/overlay/etc/pacman.conf b/configs/install-iso/overlay/etc/pacman.conf new file mode 100644 index 0000000..6fe3d29 --- /dev/null +++ b/configs/install-iso/overlay/etc/pacman.conf @@ -0,0 +1,77 @@ +# +# /etc/pacman.conf +# +# See the pacman.conf(5) manpage for option and repository directives + +# +# GENERAL OPTIONS +# +[options] +# The following paths are commented out with their default values listed. +# If you wish to use different paths, uncomment and update the paths. +#RootDir = / +#DBPath = /var/lib/pacman/ +#CacheDir = /var/cache/pacman/pkg/ +#LogFile = /var/log/pacman.log +HoldPkg = pacman glibc +# If upgrades are available for these packages they will be asked for first +SyncFirst = pacman +#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u +#XferCommand = /usr/bin/curl %u > %o +#CleanMethod = KeepInstalled + +# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup +#IgnorePkg = +#IgnoreGroup = + +#NoUpgrade = +#NoExtract = + +# Misc options (all disabled by default) +#NoPassiveFtp +#UseSyslog +#ShowSize +#UseDelta +#TotalDownload + +# +# REPOSITORIES +# - can be defined here or included from another file +# - pacman will search repositories in the order defined here +# - local/custom mirrors can be added here or in separate files +# - repositories listed first will take precedence when packages +# have identical names, regardless of version number +# - URLs will have $repo replaced by the name of the current repo +# +# Repository entries are of the format: +# [repo-name] +# Server = ServerName +# Include = IncludePath +# +# The header [repo-name] is crucial - it must be present and +# uncommented to enable the repo. +# + +# Testing is disabled by default. To enable, uncomment the following +# two lines. You can add preferred servers immediately after the header, +# and they will be used before the default mirrors. +#[testing] +#Include = /etc/pacman.d/mirrorlist + +[core] +# Add your preferred servers here, they will be used first +Include = /etc/pacman.d/mirrorlist + +[extra] +# Add your preferred servers here, they will be used first +Include = /etc/pacman.d/mirrorlist + +[community] +# Add your preferred servers here, they will be used first +Include = /etc/pacman.d/mirrorlist + +# An example of a custom package repository. See the pacman manpage for +# tips on creating your own repositories. +#[custom] +#Server = file:///home/custompkgs + diff --git a/configs/install-iso/overlay/etc/pacman.d/mirrorlist b/configs/install-iso/overlay/etc/pacman.d/mirrorlist new file mode 100644 index 0000000..60a87cc --- /dev/null +++ b/configs/install-iso/overlay/etc/pacman.d/mirrorlist @@ -0,0 +1,113 @@ +# +# Arch Linux repository mirrorlist +# + +# 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 +# - Canada +Server = ftp://mirror.csclub.uwaterloo.ca/archlinux/$repo/os/i686 +Server = ftp://mirrors.portafixe.com/archlinux/$repo/os/i686 + +# 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 +# - Venezuela +Server = http://mirror2.archlinux.com.ve/$repo/os/i686 + +# Europe +# - Austria +Server = ftp://gd.tuwien.ac.at/opsys/linux/archlinux/$repo/os/i686 +# - Belgium +Server = ftp://ftp.belnet.be/mirror/archlinux.org/$repo/os/i686 +# - Czech Republic +Server = ftp://ftp.sh.cvut.cz/MIRRORS/arch/$repo/os/i686 +# - Denmark +Server = ftp://ftp.klid.dk/archlinux/$repo/os/@CARCH@ +# - Estonia +Server = ftp://ftp.estpak.ee/pub/archlinux/$repo/os/i686 +# - 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 +# - 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 +# - 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 +# - Greece +Server = ftp://ftp.ntua.gr/pub/linux/archlinux/$repo/os/i686 +# - Hungary +Server = ftp://ftp.mfa.kfki.hu/pub/mirrors/ftp.archlinux.org/$repo/os/i686 +# - Ireland +Server = ftp://ftp.heanet.ie/mirrors/ftp.archlinux.org/$repo/os/i686 +# - Italy +Server = ftp://mi.mirror.garr.it/mirrors/archlinux/$repo/os/i686 +# - 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 +# - 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 +# - Portugal +Server = ftp://cesium.di.uminho.pt/pub/archlinux/$repo/os/i686 +# - Romania +Server = ftp://ftp.iasi.roedu.net/mirrors/archlinux.org/$repo/os/i686 +# - Russia +Server = ftp://mirror.yandex.ru/archlinux/$repo/os/i686 +Server = http://archlinux.freeside.ru/$repo/os/i686 +# - Sweden +Server = ftp://ftp.ds.hj.se/pub/os/linux/archlinux/$repo/os/i686 +Server = ftp://ftp.gigabit.nu/$repo/os/i686 +# - Switzerland +Server = http://archlinux.puzzle.ch/$repo/os/i686 +# - Turkey +Server = ftp://ftp.linux.org.tr/pub/mirrors/archlinux/$repo/os/i686 +# - Ukraine +Server = ftp://archlinux.hell.org.ua/archlinux/$repo/os/i686 +Server = ftp://ftp.linux.kiev.ua/pub/Linux/ArchLinux/$repo/os/i686 + +# Asia +# - Indonesia +Server = http://archlinux.cbn.net.id/$repo/os/i686 +Server = ftp://archlinux.cbn.net.id/pub/archlinux/$repo/os/i686 +# - Israel +Server = http://mirror.isoc.org.il/pub/archlinux/$repo/os/i686 +# - Vietnam +# Domain name is ftp.indochinalinux.com but there are frequent DNS problems +Server = ftp://202.78.230.5/archlinux/$repo/os/i686 + +# 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 + diff --git a/configs/install-iso/packages.list b/configs/install-iso/packages.list index 287de78..41d2219 100644 --- a/configs/install-iso/packages.list +++ b/configs/install-iso/packages.list @@ -1,5 +1,4 @@ archlinux-installer -atl2 base dnsutils dosfstools @@ -40,6 +39,5 @@ tiacx tiacx-firmware unionfs-utils wireless_tools -wlan-ng26 wlan-ng26-utils zd1211-firmware