root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-20 03:50:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix keyring installation

Browse source
This commit is contained in:
Tobias Powalowski 2022-08-31 19:17:47 +02:00
parent 8d1d50894f
commit 947c511fe6
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
usr/lib/archboot/container.sh
View file

@ -95,7 +95,7 @@ _prepare_pacman() {
echo "Update Arch Linux keying ..." echo "Update Arch Linux keying ..."
KEYRING="archlinux-keyring" KEYRING="archlinux-keyring"
[[ "$(uname -m)" == aarch64 ]] && KEYRING="archlinux-keyring archlinuxarm-keyring" [[ "$(uname -m)" == aarch64 ]] && KEYRING="archlinux-keyring archlinuxarm-keyring"
pacman -Sy ${KEYRING} pacman -Sy --noconfirm ${KEYRING}
} }
#shellcheck disable=SC2120 #shellcheck disable=SC2120

2
usr/lib/archboot/installer/pacman.sh
View file

@ -103,7 +103,7 @@ prepare_pacman() {
DIALOG --infobox "Update Arch Linux keying ..." 3 40 DIALOG --infobox "Update Arch Linux keying ..." 3 40
KEYRING="archlinux-keyring" KEYRING="archlinux-keyring"
[[ "$(uname -m)" == aarch64 ]] && KEYRING="archlinux-keyring archlinuxarm-keyring" [[ "$(uname -m)" == aarch64 ]] && KEYRING="archlinux-keyring archlinuxarm-keyring"
${PACMAN} -Sy ${KEYRING} > "${LOG}" 2>&1 || (DIALOG --msgbox "Pacman preparation failed! Check ${LOG} for errors." 6 60; return 1) pacman -Sy --noconfirm --noprogressbar ${KEYRING} > "${LOG}" 2>&1 || (DIALOG --msgbox "Pacman preparation failed! Check ${LOG} for errors." 6 60; return 1)
return 0 return 0
} }