diff options
| author | Esteban Carnevale <alfplayer@mailoo.org> | 2013-09-02 20:03:39 -0300 |
|---|---|---|
| committer | Esteban Carnevale <alfplayer@mailoo.org> | 2013-09-02 20:03:39 -0300 |
| commit | a5139a6e4ed897d59c900d8ea991c60a19d01862 (patch) | |
| tree | f82a2c95fe0f34ddf5e7e4d88bfa33548e8269a8 /configs/releng/pacman.conf | |
| parent | 2ad1f4471698f00cc3985437f461e2e17aeccfa3 (diff) | |
| parent | 491b627eb4b6af909ba8e19751378672930328eb (diff) | |
Merge branch 'master' of archiso into helper/rebrandhelper/rebrand
Conflicts:
Makefile
configs/releng/build.sh
configs/releng/mkinitcpio.conf
configs/releng/root-image/root/customize_root_image.sh
configs/releng/syslinux/parabolaiso_pxe32.cfg
configs/releng/syslinux/parabolaiso_pxe64.cfg
configs/releng/syslinux/parabolaiso_sys32.cfg
configs/releng/syslinux/parabolaiso_sys64.cfg
docs/README.build
parabolaiso/mkparabolaiso
Diffstat (limited to 'configs/releng/pacman.conf')
| -rw-r--r-- | configs/releng/pacman.conf | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/configs/releng/pacman.conf b/configs/releng/pacman.conf index 41e9634..800d572 100644 --- a/configs/releng/pacman.conf +++ b/configs/releng/pacman.conf @@ -15,11 +15,10 @@ #LogFile = /var/log/pacman.log #GPGDir = /etc/pacman.d/gnupg/ HoldPkg = pacman glibc -# If upgrades are available for these packages they will be asked for first -SyncFirst = pacman #XferCommand = /usr/bin/curl -C - -f %u > %o #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u #CleanMethod = KeepInstalled +#UseDelta = 0.7 Architecture = auto # Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup @@ -31,7 +30,7 @@ Architecture = auto # Misc options #UseSyslog -#UseDelta +#Color #TotalDownload # We cannot check disk space from within a chroot environment #CheckSpace @@ -39,7 +38,9 @@ Architecture = auto # By default, pacman accepts packages signed by keys that its local keyring # trusts (see pacman-key and its man page), as well as unsigned packages. -#SigLevel = Optional TrustedOnly +SigLevel = Required DatabaseOptional +LocalFileSigLevel = Optional +#RemoteFileSigLevel = Required # NOTE: You must run `pacman-key --init` before first using pacman; the local # keyring can then be populated with the keys of all official Parabola GNU/Linux-libre @@ -69,23 +70,18 @@ Architecture = auto # after the header, and they will be used before the default mirrors. #[testing] -#SigLevel = PackageRequired #Include = /etc/pacman.d/mirrorlist [core] -SigLevel = PackageRequired Include = /etc/pacman.d/mirrorlist [extra] -SigLevel = PackageRequired Include = /etc/pacman.d/mirrorlist #[community-testing] -#SigLevel = PackageRequired #Include = /etc/pacman.d/mirrorlist [community] -SigLevel = PackageRequired Include = /etc/pacman.d/mirrorlist # An example of a custom package repository. See the pacman manpage for |