Merge branch 'fix-opensuse' into 'develop'

add hotfix for opensuse image

See merge request kasm-technologies/internal/workspaces-core-images!55
This commit is contained in:
Justin Travis 2022-05-03 18:49:34 +00:00
commit 593af89ea7

6
src/common/startup_scripts/vnc_startup.sh Normal file → Executable file
View File

@ -81,7 +81,11 @@ function start_window_manager (){
DISPLAY=:1 /opt/VirtualGL/bin/vglrun -d "${KASM_EGL_CARD}" /usr/bin/startxfce4 --replace &
else
echo "Starting XFCE"
/usr/bin/startxfce4 --replace &
if [ -f '/usr/bin/zypper' ]; then
DISPLAY=:1 /usr/bin/dbus-launch /usr/bin/startxfce4 --replace &
else
/usr/bin/startxfce4 --replace &
fi
fi
KASM_PROCS['window_manager']=$!
else