From 40f6563d450841915ed8f44598aefbe03a9ac0fd Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Sat, 8 Oct 2022 21:43:55 +0200
Subject: [PATCH] don't remove firmware on full system, don't install
 FIX_PACKAGES on full system

---
 usr/lib/archboot/update-installer.sh | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/usr/lib/archboot/update-installer.sh b/usr/lib/archboot/update-installer.sh
index dcfad4631..8acbf2546 100644
--- a/usr/lib/archboot/update-installer.sh
+++ b/usr/lib/archboot/update-installer.sh
@@ -332,10 +332,12 @@ _cleanup_cache() {
 }
 
 _prepare_graphic() {
-    echo "Removing firmware files ..."
-    rm -rf /usr/lib/firmware
-    # fix libs first, then install packages from defaults
-    _GRAPHIC="${_FIX_PACKAGES} ${1}"
+    if [[ ! -e "/.full-system" ]]; then
+        echo "Removing firmware files ..."
+        rm -rf /usr/lib/firmware
+        # fix libs first, then install packages from defaults
+        _GRAPHIC="${_FIX_PACKAGES} ${1}"
+    fi
     # saving RAM by calling always cleanup hook and installing each package alone
     if [[ -e /var/cache/pacman/pkg/archboot.db ]]; then
         echo "Running pacman to install packages: ${_GRAPHIC} ..."
@@ -348,7 +350,7 @@ _prepare_graphic() {
         for i in ${_GRAPHIC}; do
             #shellcheck disable=SC2086
             pacman -S ${i} --config ${_PACMAN_CONF} --noconfirm >/dev/null 2>&1 || exit 1
-            [[ ! -e "/.full-system" ]] &&_cleanup_install
+            [[ ! -e "/.full-system" ]] && _cleanup_install
             [[ "$(grep -w MemTotal /proc/meminfo | cut -d ':' -f2 | sed -e 's# ##g' -e 's#kB$##g')" -lt 4413000 ]] && _cleanup_cache
             rm -f /var/log/pacman.log
         done