root/archboot
1
0
Fork 0
mirror of https://gitlab.archlinux.org/tpowa/archboot.git synced 2024-09-20 03:50:37 +02:00
Code Issues Projects Releases Packages Wiki Activity

fix kde-wayland startup by adding xorg-xwayland package, rename WAYLAND_PACKAGE to WAYLAND_PACKAGES

Browse source
This commit is contained in:
Tobias Powalowski 2022-05-29 22:01:14 +02:00
parent 2ab2af0102
commit 0338a10622
4 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
usr/bin/archboot-update-installer.sh
View file

@ -105,7 +105,7 @@ if [[ "${_CUSTOM_X}" == "1" || "${_CUSTOM_WAYLAND}" == "1" ]]; then
if [[ "${_CUSTOM_WAYLAND}" == "1" ]]; then
echo -e "\033[1mStep 3/3:\033[0m Installing custom wayland ..."
echo " This will need some time ..."
_prepare_graphic "${_WAYLAND_PACKAGE} ${_CUSTOM_WAYLAND}" > /dev/tty7 2>&1
_prepare_graphic "${_WAYLAND_PACKAGES} ${_CUSTOM_WAYLAND}" > /dev/tty7 2>&1
fi
if [[ "${_CUSTOM_X}" == "1" ]]; then
echo -e "\033[1mStep 3/3:\033[0m Installing custom xorg ..."

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

@ -9,7 +9,7 @@ _PACMAN_CONF="/etc/pacman.conf"
_FIX_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_PACKAGE="xorg"
_VNC_PACKAGE="tigervnc"
_WAYLAND_PACKAGE="egl-wayland"
_WAYLAND_PACKAGES="egl-wayland xorg-xwayland"
_STANDARD_PACKAGES="gparted nss-mdns chromium"
_XORG="${_XORG_PACKAGE} ${_VNC_PACKAGE} ${_STANDARD_PACKAGES} ${_XFCE_PACKAGES}"

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

@ -5,7 +5,7 @@ _install_gnome_wayland() {
if ! [[ -e /usr/bin/gnome-session ]]; then
echo -e "\033[1mStep 3/5:\033[0m Installing GNOME Wayland now ..."
echo " This will need some time ..."
_prepare_graphic "${_WAYLAND_PACKAGE} ${_STANDARD_PACKAGES} ${_GNOME_PACKAGES}" >/dev/tty7 2>&1
_prepare_graphic "${_WAYLAND_PACKAGES} ${_STANDARD_PACKAGES} ${_GNOME_PACKAGES}" >/dev/tty7 2>&1
echo -e "\033[1mStep 4/5:\033[0m Configuring GNOME Wayland ..."
_configure_gnome_wayland >/dev/tty7 2>&1
systemd-sysusers >/dev/tty7 2>&1

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

@ -5,7 +5,7 @@ _install_kde_wayland() {
if ! [[ -e /usr/bin/startplasma-x11 ]]; then
echo -e "\033[1mStep 3/5:\033[0m Installing KDE/Plasma Wayland now ..."
echo " This will need some time ..."
_prepare_graphic "${_WAYLAND_PACKAGE} ${_STANDARD_PACKAGES} ${_KDE_PACKAGES}" >/dev/tty7 2>&1
_prepare_graphic "${_WAYLAND_PACKAGES} ${_STANDARD_PACKAGES} ${_KDE_PACKAGES}" >/dev/tty7 2>&1
echo -e "\033[1mStep 4/5:\033[0m Configuring KDE/Plasma Wayland ..."
_configure_kde_wayland >/dev/tty7 2>&1
else