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

fix offline pacman

Browse source
This commit is contained in:
Tobias Powalowski 2023-06-27 23:17:34 +02:00
parent 964df5487a
commit cdde1a6227
2 changed files with 2 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
usr/lib/archboot/installer/common.sh
View file

@ -24,7 +24,7 @@ if [[ "${_RUNNING_ARCH}" == "aarch64" ]]; then
_VMLINUZ_EFISTUB="Image" _VMLINUZ_EFISTUB="Image"
fi fi
# abstract the common pacman args # abstract the common pacman args
_PACMAN="pacman --root ${_DESTDIR} ${_PACMAN_CONF} --cachedir=${_DESTDIR}/var/cache/pacman/pkg --noconfirm --noprogressbar" _PACMAN="pacman --root ${_DESTDIR} --cachedir=${_DESTDIR}/var/cache/pacman/pkg --noconfirm --noprogressbar"
_MIRRORLIST="/etc/pacman.d/mirrorlist" _MIRRORLIST="/etc/pacman.d/mirrorlist"
_linux_firmware() { _linux_firmware() {
@ -88,6 +88,7 @@ _local_pacman_conf() {
echo "[archboot]" >> "${_PACMAN_CONF}" echo "[archboot]" >> "${_PACMAN_CONF}"
echo "Server = file:///var/cache/pacman/pkg" >> "${_PACMAN_CONF}" echo "Server = file:///var/cache/pacman/pkg" >> "${_PACMAN_CONF}"
_PACMAN_CONF="--config ${_PACMAN_CONF}" _PACMAN_CONF="--config ${_PACMAN_CONF}"
_PACMAN="pacman --root ${_DESTDIR} ${_PACMAN_CONF} --cachedir=${_DESTDIR}/var/cache/pacman/pkg --noconfirm --noprogressbar"
} }
_auto_packages() { _auto_packages() {

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

@ -127,11 +127,6 @@ _prepare_pacman() {
sleep 1 sleep 1
done done
[[ -e /etc/systemd/system/pacman-init.service ]] && systemctl stop pacman-init.service [[ -e /etc/systemd/system/pacman-init.service ]] && systemctl stop pacman-init.service
_dialog --infobox "Refreshing package database..." 3 40
if ! ${_PACMAN} -Sy ${_PACMAN_CONF} &>"${_LOG}"; then
_dialog --msgbox "Pacman preparation failed! Check ${_LOG} for errors." 6 60
return 1
fi
_dialog --infobox "Update Arch Linux keyring..." 3 40 _dialog --infobox "Update Arch Linux keyring..." 3 40
_KEYRING="archlinux-keyring" _KEYRING="archlinux-keyring"
[[ "${_RUNNING_ARCH}" == "aarch64" ]] && _KEYRING="${_KEYRING} archlinuxarm-keyring" [[ "${_RUNNING_ARCH}" == "aarch64" ]] && _KEYRING="${_KEYRING} archlinuxarm-keyring"