From 33515ff9bf656ed166aa8819127c072ec2c12ebc Mon Sep 17 00:00:00 2001
From: Tobias Powalowski <tpowa@archlinux.org>
Date: Sun, 29 May 2022 11:41:41 +0200
Subject: [PATCH] readd xorg to GRAPHIC_PACKAGES, else local image is broken

---
 etc/archboot/defaults     | 4 ++--
 usr/lib/archboot/gnome.sh | 2 +-
 usr/lib/archboot/kde.sh   | 2 +-
 usr/lib/archboot/xfce.sh  | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/etc/archboot/defaults b/etc/archboot/defaults
index 9a27a186f..432b73066 100644
--- a/etc/archboot/defaults
+++ b/etc/archboot/defaults
@@ -6,8 +6,8 @@ _GRUB_CONFIG="/usr/share/archboot/grub/archboot-main-grub.cfg"
 _GRUB_BACKGROUND="/usr/share/archboot/grub/archboot-background.png"
 ### Graphical environment defaults
 # needed full installed packages in environment
-_GRAPHIC_PACKAGES="libunwind libelf libevent python talloc gdbm fuse3 gcc-libs perl glibc libtiff glib2 libcups harfbuzz avahi nss p11-kit libp11-kit fuse tpm2-tss libsecret smbclient libcap tevent libbsd libldap tdb ldb libmd jansson libsasl pcre2 tigervnc gparted nss-mdns chromium"
-# ignore packages to upgrade before graohical startup eg. kernel and firmware
+_GRAPHIC_PACKAGES="libunwind libelf libevent python talloc gdbm fuse3 gcc-libs perl glibc libtiff glib2 libcups harfbuzz avahi nss p11-kit libp11-kit fuse tpm2-tss libsecret smbclient libcap tevent libbsd libldap tdb ldb libmd jansson libsasl pcre2 xorg tigervnc gparted nss-mdns chromium"
+# ignore packages to upgrade before graphical startup eg. kernel and firmware
 _GRAPHIC_IGNORE="linux linux-firmware linux-firmware-marvell"
 # VNC password
 _VNC_PW="archboot"
diff --git a/usr/lib/archboot/gnome.sh b/usr/lib/archboot/gnome.sh
index 2dac0dfe4..cdf2844ab 100644
--- a/usr/lib/archboot/gnome.sh
+++ b/usr/lib/archboot/gnome.sh
@@ -5,7 +5,7 @@ _install_gnome() {
     if ! [[ -e /usr/bin/gnome-session ]]; then
         echo -e "\033[1mStep 3/5:\033[0m Installing GNOME desktop now ..."
         echo "          This will need some time ..."
-        _prepare_graphic "xorg ${_GNOME_PACKAGES}" >/dev/tty7 2>&1
+        _prepare_graphic "${_GNOME_PACKAGES}" >/dev/tty7 2>&1
         echo -e "\033[1mStep 4/5:\033[0m Configuring GNOME desktop ..."
         _configure_gnome >/dev/tty7 2>&1
         systemd-sysusers
diff --git a/usr/lib/archboot/kde.sh b/usr/lib/archboot/kde.sh
index d4f4b8c2b..bfd96ddf5 100644
--- a/usr/lib/archboot/kde.sh
+++ b/usr/lib/archboot/kde.sh
@@ -5,7 +5,7 @@ _install_kde() {
     if ! [[ -e /usr/bin/startplasma-x11 ]]; then
         echo -e "\033[1mStep 3/5:\033[0m Installing KDE desktop now ..."
         echo "          This will need some time ..."
-        _prepare_graphic "xorg ${_KDE_PACKAGES}" >/dev/tty7 2>&1
+        _prepare_graphic "${_KDE_PACKAGES}" >/dev/tty7 2>&1
         echo -e "\033[1mStep 4/5:\033[0m Configuring KDE desktop ..."
         _configure_kde >/dev/tty7 2>&1
     fi
diff --git a/usr/lib/archboot/xfce.sh b/usr/lib/archboot/xfce.sh
index 595fccf07..6f65456f3 100644
--- a/usr/lib/archboot/xfce.sh
+++ b/usr/lib/archboot/xfce.sh
@@ -5,7 +5,7 @@ _install_xfce() {
     if ! [[ -e /usr/bin/startxfce4 ]]; then
         echo -e "\033[1mStep 3/5:\033[0m Installing XFCE desktop now ..."
         echo "          This will need some time ..."
-        _prepare_graphic "xorg ${_XFCE_PACKAGES}" >/dev/tty7 2>&1
+        _prepare_graphic "${_XFCE_PACKAGES}" >/dev/tty7 2>&1
         echo -e "\033[1mStep 4/5:\033[0m Configuring XFCE desktop ..."
         _configure_xfce >/dev/tty7 2>&1
     fi