From aa54e17bcc16e5b151365f594784b887812bab2a Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Tue, 3 May 2022 15:36:34 +0200
Subject: [PATCH] add local switch for xorg startup

---
 usr/bin/archboot-update-installer.sh |  1 +
 usr/lib/archboot/update-installer.sh | 15 +++++++++++----
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/usr/bin/archboot-update-installer.sh b/usr/bin/archboot-update-installer.sh
index 9ca9b25e1..0844ba90f 100755
--- a/usr/bin/archboot-update-installer.sh
+++ b/usr/bin/archboot-update-installer.sh
@@ -2,6 +2,7 @@
 # created by Tobias Powalowski <tpowa@archlinux.org>
 . /etc/archboot/defaults
 . /usr/lib/archboot/common.sh
+. /usr/lib/archboot/container.sh
 . /usr/lib/archboot/update-installer.sh
 
 [[ -z "${1}" ]] && usage
diff --git a/usr/lib/archboot/update-installer.sh b/usr/lib/archboot/update-installer.sh
index 5781a14a6..7dd9cee22 100644
--- a/usr/lib/archboot/update-installer.sh
+++ b/usr/lib/archboot/update-installer.sh
@@ -231,11 +231,18 @@ _kexec() {
 }
 
 _launch_xfce() {
-    echo "Updating environment ..."
-    pacman -Syu --ignore linux --ignore linux-firmware
-    echo "Install packages ..."
     X_PACKAGES="xorg xfce4 libtiff glib2 chromium libcups gcc-libs glibc harfbuzz avahi nss breeze-icons tigervnc perl"
-    pacman -Sy ${X_PACKAGES} --noconfirm
+    if [[ -e /var/cache/pacman/pkg/archboot.db ]]; then
+        echo "Install packages ..."
+        _INSTALL_SOURCE="file:///var/cache/pacman/pkg"
+        _create_pacman_conf
+        pacman -Sy ${X_PACKAGES} --config ${_PACMAN_CONF} --noconfirm
+    else
+        echo "Updating environment ..."
+        pacman -Syu --ignore linux --ignore linux-firmware
+        echo "Install packages ..."
+        pacman -Sy ${X_PACKAGES} --noconfirm
+    fi
     echo "Cleanup archboot environment ..."
     rm -r /usr/share/{locale,man,info,doc,gtk-doc,ibus}
     rm -r /usr/include