Redundancy for keyring failures

This commit is contained in:
natemaia 2021-09-04 13:15:51 -07:00
parent 20844b6342
commit 4be1ccae29

View File

@ -6,7 +6,7 @@
# AIF, Calamares, and the Arch Wiki.. Credit where credit is due # AIF, Calamares, and the Arch Wiki.. Credit where credit is due
# shellcheck disable=SC2086,SC2046,SC2254,SC2164 # shellcheck disable=SC2086,SC2046,SC2254,SC2164
VER=2.7 VER=2.8
# default values { # default values {
@ -2210,13 +2210,14 @@ install_background()
( (
install_mirrorlist > /tmp/bgout 2>&1 install_mirrorlist > /tmp/bgout 2>&1
al_repo "/etc/pacman.conf" al_repo "/etc/pacman.conf"
pacman -Sy >> /tmp/bgout 2>&1 pacman -Syy >> /tmp/bgout 2>&1
pacstrap /mnt >> /tmp/bgout 2>&1 pacstrap /mnt >> /tmp/bgout 2>&1
cp -Rf /etc/pacman.d "$MNT/etc/" cp -Rf /etc/pacman.d "$MNT/etc/"
cp -f /etc/pacman.conf "$MNT/etc/" cp -f /etc/pacman.conf "$MNT/etc/"
cp -f /etc/pacman.d/mirrorlist "$MNT/etc/pacman.d/" cp -f /etc/pacman.d/mirrorlist "$MNT/etc/pacman.d/"
al_repo "$MNT/etc/pacman.conf" || chrun "pacman -Syyu --noconfirm" >> /tmp/bgout 2>&1 al_repo "$MNT/etc/pacman.conf" || chrun "pacman -Syyu --noconfirm" >> /tmp/bgout 2>&1
chrun "pacman -S archlinux-keyring --noconfirm" >> /tmp/bgout 2>&1
chrun "pacman -S ${ISO_PKGS[*]} $net $luks --noconfirm --needed" >> /tmp/bgout 2>&1 chrun "pacman -S ${ISO_PKGS[*]} $net $luks --noconfirm --needed" >> /tmp/bgout 2>&1