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

readd xorg to GRAPHIC_PACKAGES, else local image is broken

Browse source
This commit is contained in:
Tobias Powalowski 2022-05-29 11:41:41 +02:00
parent 4fe231bed6
commit 33515ff9bf
4 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
etc/archboot/defaults
View file

@ -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"

2
usr/lib/archboot/gnome.sh
View file

@ -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

2
usr/lib/archboot/kde.sh
View file

@ -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

2
usr/lib/archboot/xfce.sh
View file

@ -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