From cb077064884dde35abb2ddbd3111220a716c7895 Mon Sep 17 00:00:00 2001 From: arcolinuxz Date: Mon, 22 May 2023 10:34:32 +0200 Subject: [PATCH] migration arch --- archiso/airootfs/etc/pacman.conf | 13 +++++-------- archiso/pacman.conf | 25 +++++++++++-------------- 2 files changed, 16 insertions(+), 22 deletions(-) diff --git a/archiso/airootfs/etc/pacman.conf b/archiso/airootfs/etc/pacman.conf index 6377272..6161dd7 100644 --- a/archiso/airootfs/etc/pacman.conf +++ b/archiso/airootfs/etc/pacman.conf @@ -17,7 +17,7 @@ #LogFile = /var/log/pacman.log #GPGDir = /etc/pacman.d/gnupg/ #HookDir = /etc/pacman.d/hooks/ -HoldPkg = pacman glibc +HoldPkg = pacman glibc #XferCommand = /usr/bin/curl -L -C - -f -o %o %u #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u #CleanMethod = KeepInstalled @@ -36,7 +36,7 @@ Architecture = auto #NoProgressBar #CheckSpace #VerbosePkgLists -ParallelDownloads = 5 +ParallelDownloads = 8 # 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. @@ -71,19 +71,16 @@ LocalFileSigLevel = Optional # repo name header and Include lines. You can add preferred servers immediately # after the header, and they will be used before the default mirrors. -#[testing] +#[core-testing] #Include = /etc/pacman.d/mirrorlist [core] Include = /etc/pacman.d/mirrorlist -[extra] -Include = /etc/pacman.d/mirrorlist - -#[community-testing] +#[extra-testing] #Include = /etc/pacman.d/mirrorlist -[community] +[extra] Include = /etc/pacman.d/mirrorlist # If you want to run 32 bit applications on your x86_64 system, diff --git a/archiso/pacman.conf b/archiso/pacman.conf index 618c8ef..0807a4c 100644 --- a/archiso/pacman.conf +++ b/archiso/pacman.conf @@ -2,6 +2,8 @@ # /etc/pacman.conf # # See the pacman.conf(5) manpage for option and repository directives +# +# SPDX-License-Identifier: GPL-3.0-or-later # # GENERAL OPTIONS @@ -15,7 +17,7 @@ #LogFile = /var/log/pacman.log #GPGDir = /etc/pacman.d/gnupg/ #HookDir = /etc/pacman.d/hooks/ -HoldPkg = pacman glibc +HoldPkg = pacman glibc #XferCommand = /usr/bin/curl -L -C - -f -o %o %u #XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u #CleanMethod = KeepInstalled @@ -32,10 +34,9 @@ Architecture = auto #UseSyslog #Color #NoProgressBar -# We cannot check disk space from within a chroot environment #CheckSpace #VerbosePkgLists -ParallelDownloads = 5 +ParallelDownloads = 8 # 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. @@ -89,35 +90,31 @@ Server = https://arch-linux-calamares-installer.github.io/$repo/$arch #repositories from ArcoLinux #[arcolinux_repo_testing] -#SigLevel = Required DatabaseOptional +#SigLevel = Optional TrustedOnly #Include = /etc/pacman.d/arcolinux-mirrorlist #[arcolinux_repo] -#SigLevel = Required DatabaseOptional +#SigLevel = Optional TrustedOnly #Include = /etc/pacman.d/arcolinux-mirrorlist #[arcolinux_repo_3party] -#SigLevel = Required DatabaseOptional +#SigLevel = Optional TrustedOnly #Include = /etc/pacman.d/arcolinux-mirrorlist #[arcolinux_repo_xlarge] -#SigLevel = Required DatabaseOptional +#SigLevel = Optional TrustedOnly #Include = /etc/pacman.d/arcolinux-mirrorlist -#repositories from Arch Linux -#[testing] +#[core-testing] #Include = /etc/pacman.d/mirrorlist [core] Include = /etc/pacman.d/mirrorlist -[extra] -Include = /etc/pacman.d/mirrorlist - -#[community-testing] +#[extra-testing] #Include = /etc/pacman.d/mirrorlist -[community] +[extra] Include = /etc/pacman.d/mirrorlist # If you want to run 32 bit applications on your x86_64 system,