From f3f95d0a6e0eb3dcdb59fc164313017243b3c2aa Mon Sep 17 00:00:00 2001 From: Dmitry Maksyoma Date: Wed, 19 Mar 2025 15:16:06 +1300 Subject: [PATCH] KASM-6008 Ensure Zink starts, when KASM_EGL_CARD is defined NVidia needs KASM_EGL_CARD to work with Zink. --- src/common/startup_scripts/vnc_startup.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/common/startup_scripts/vnc_startup.sh b/src/common/startup_scripts/vnc_startup.sh index ca121b4..ddd0df6 100755 --- a/src/common/startup_scripts/vnc_startup.sh +++ b/src/common/startup_scripts/vnc_startup.sh @@ -195,12 +195,12 @@ function start_kasmvnc (){ function start_window_manager (){ echo -e "\n------------------ Xfce4 window manager startup------------------" if [ "${START_XFCE4}" == "1" ] || [ "${START_DE}" == "xfce4-session" ]; then - if [ -f /opt/VirtualGL/bin/vglrun ] && [ ! -z "${KASM_EGL_CARD}" ] && [ ! -z "${KASM_RENDERD}" ] && [ -O "${KASM_RENDERD}" ] && [ -O "${KASM_EGL_CARD}" ] ; then - echo "Starting XFCE with VirtualGL using EGL device ${KASM_EGL_CARD}" - DISPLAY=:1 /opt/VirtualGL/bin/vglrun -d "${KASM_EGL_CARD}" /usr/bin/startxfce4 --replace & - elif [ -n "$KASM_ENABLE_ZINK" ]; then + if [ -n "$KASM_ENABLE_ZINK" ] && [ -n "$KASM_DRI_CARD" ] && [ -n "$KASM_DRI_RENDERD" ]; then echo "Starting XFCE with Zink" LIBGL_KOPPER_DRI2=1 MESA_LOADER_DRIVER_OVERRIDE=zink GALLIUM_DRIVER=zink DISPLAY=:1 /usr/bin/startxfce4 --replace & + elif [ -f /opt/VirtualGL/bin/vglrun ] && [ ! -z "${KASM_EGL_CARD}" ] && [ ! -z "${KASM_RENDERD}" ] && [ -O "${KASM_RENDERD}" ] && [ -O "${KASM_EGL_CARD}" ] ; then + echo "Starting XFCE with VirtualGL using EGL device ${KASM_EGL_CARD}" + DISPLAY=:1 /opt/VirtualGL/bin/vglrun -d "${KASM_EGL_CARD}" /usr/bin/startxfce4 --replace & else echo "Starting XFCE" DISPLAY=:1 /usr/bin/startxfce4 --replace &