From cdde1a62271718aa94395d1de5d2397fa02661cb Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Tue, 27 Jun 2023 23:17:34 +0200
Subject: [PATCH] fix offline pacman

---
 usr/lib/archboot/installer/common.sh | 3 ++-
 usr/lib/archboot/installer/pacman.sh | 5 -----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/usr/lib/archboot/installer/common.sh b/usr/lib/archboot/installer/common.sh
index 73c4d8199..dac666fbf 100644
--- a/usr/lib/archboot/installer/common.sh
+++ b/usr/lib/archboot/installer/common.sh
@@ -24,7 +24,7 @@ if [[ "${_RUNNING_ARCH}" == "aarch64" ]]; then
     _VMLINUZ_EFISTUB="Image"
 fi
 # 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"
 
 _linux_firmware() {
@@ -88,6 +88,7 @@ _local_pacman_conf() {
     echo "[archboot]" >> "${_PACMAN_CONF}"
     echo "Server = file:///var/cache/pacman/pkg" >> "${_PACMAN_CONF}"
     _PACMAN_CONF="--config ${_PACMAN_CONF}"
+    _PACMAN="pacman --root ${_DESTDIR} ${_PACMAN_CONF} --cachedir=${_DESTDIR}/var/cache/pacman/pkg --noconfirm --noprogressbar"
 }
 
 _auto_packages() {
diff --git a/usr/lib/archboot/installer/pacman.sh b/usr/lib/archboot/installer/pacman.sh
index 125b72c78..ec15d28e1 100644
--- a/usr/lib/archboot/installer/pacman.sh
+++ b/usr/lib/archboot/installer/pacman.sh
@@ -127,11 +127,6 @@ _prepare_pacman() {
         sleep 1
     done
     [[ -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
     _KEYRING="archlinux-keyring"
     [[ "${_RUNNING_ARCH}" == "aarch64" ]] && _KEYRING="${_KEYRING} archlinuxarm-keyring"