Merge branch 'bugfix/KASM-4160_blank_screen' into 'develop'

KASM-4160 blank screen

Closes KASM-4160

See merge request kasm-technologies/internal/workspaces-core-images!113

dockerfile-kasm-core

@@ -44,6 +44,7 @@ ENV DISPLAY=:1 \
     LC_ALL=$LC_ALL \
     KASMVNC_AUTO_RECOVER=true \
     PULSE_RUNTIME_PATH=/var/run/pulse \
+    DISTRO=$DISTRO \
     SDL_GAMECONTROLLERCONFIG="030000005e040000be02000014010000,XInput Controller,platform:Linux,a:b0,b:b1,x:b2,y:b3,back:b8,guide:b16,start:b9,leftstick:b10,rightstick:b11,leftshoulder:b4,rightshoulder:b5,dpup:b12,dpdown:b13,dpleft:b14,dpright:b15,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:b6,righttrigger:b7"
 
 EXPOSE $VNC_PORT \

dockerfile-kasm-core-alpine

@@ -63,6 +63,7 @@ ENV DISPLAY=:1 \
     SINGLE_APPLICATION=0 \
     KASMVNC_AUTO_RECOVER=true \
     PULSE_RUNTIME_PATH=/var/run/pulse \
+    DISTRO=$DISTRO \
     SDL_GAMECONTROLLERCONFIG="030000005e040000be02000014010000,XInput Controller,platform:Linux,a:b0,b:b1,x:b2,y:b3,back:b8,guide:b16,start:b9,leftstick:b10,rightstick:b11,leftshoulder:b4,rightshoulder:b5,dpup:b12,dpdown:b13,dpleft:b14,dpright:b15,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:b6,righttrigger:b7"
 
 EXPOSE $VNC_PORT \

dockerfile-kasm-core-centos

@@ -58,6 +58,7 @@ ENV DISPLAY=:1 \
     SINGLE_APPLICATION=0 \
     KASMVNC_AUTO_RECOVER=true \
     PULSE_RUNTIME_PATH=/var/run/pulse \
+    DISTRO=$DISTRO \
     SDL_GAMECONTROLLERCONFIG="030000005e040000be02000014010000,XInput Controller,platform:Linux,a:b0,b:b1,x:b2,y:b3,back:b8,guide:b16,start:b9,leftstick:b10,rightstick:b11,leftshoulder:b4,rightshoulder:b5,dpup:b12,dpdown:b13,dpleft:b14,dpright:b15,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:b6,righttrigger:b7"
 
 EXPOSE $VNC_PORT \

dockerfile-kasm-core-fedora

@@ -62,6 +62,7 @@ ENV DISPLAY=:1 \
     SINGLE_APPLICATION=0 \
     KASMVNC_AUTO_RECOVER=true \
     PULSE_RUNTIME_PATH=/var/run/pulse \
+    DISTRO=$DISTRO \
     SDL_GAMECONTROLLERCONFIG="030000005e040000be02000014010000,XInput Controller,platform:Linux,a:b0,b:b1,x:b2,y:b3,back:b8,guide:b16,start:b9,leftstick:b10,rightstick:b11,leftshoulder:b4,rightshoulder:b5,dpup:b12,dpdown:b13,dpleft:b14,dpright:b15,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:b6,righttrigger:b7"
 
 EXPOSE $VNC_PORT \

dockerfile-kasm-core-oracle

@@ -67,6 +67,7 @@ ENV DISPLAY=:1 \
     SINGLE_APPLICATION=0 \
     KASMVNC_AUTO_RECOVER=true \
     PULSE_RUNTIME_PATH=/var/run/pulse \
+    DISTRO=$DISTRO \
     SDL_GAMECONTROLLERCONFIG="030000005e040000be02000014010000,XInput Controller,platform:Linux,a:b0,b:b1,x:b2,y:b3,back:b8,guide:b16,start:b9,leftstick:b10,rightstick:b11,leftshoulder:b4,rightshoulder:b5,dpup:b12,dpdown:b13,dpleft:b14,dpright:b15,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:b6,righttrigger:b7"
 
 EXPOSE $VNC_PORT \

dockerfile-kasm-core-suse

@@ -62,6 +62,7 @@ ENV DISPLAY=:1 \
     SINGLE_APPLICATION=0 \
     KASMVNC_AUTO_RECOVER=true \
     PULSE_RUNTIME_PATH=/var/run/pulse \
+    DISTRO=$DISTRO \
     SDL_GAMECONTROLLERCONFIG="030000005e040000be02000014010000,XInput Controller,platform:Linux,a:b0,b:b1,x:b2,y:b3,back:b8,guide:b16,start:b9,leftstick:b10,rightstick:b11,leftshoulder:b4,rightshoulder:b5,dpup:b12,dpdown:b13,dpleft:b14,dpright:b15,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:b6,righttrigger:b7"
 
 EXPOSE $VNC_PORT \

src/common/startup_scripts/vnc_startup.sh

@@ -62,12 +62,12 @@ function start_kasmvnc (){
 	    || echo "no locks present"
 	fi
 
-    rm -rf $HOME/.vnc/*.pid
+	rm -rf $HOME/.vnc/*.pid
-    echo "exit 0" > $HOME/.vnc/xstartup
+	echo "exit 0" > $HOME/.vnc/xstartup
-    chmod +x $HOME/.vnc/xstartup
+	chmod +x $HOME/.vnc/xstartup
 
-		VNCOPTIONS="$VNCOPTIONS -select-de manual"
+	VNCOPTIONS="$VNCOPTIONS -select-de manual"
-    if [[ "${BUILD_ARCH}" =~ ^aarch64$ ]] && [[ -f /lib/aarch64-linux-gnu/libgcc_s.so.1 ]] ; then
+	if [[ "${BUILD_ARCH}" =~ ^aarch64$ ]] && [[ -f /lib/aarch64-linux-gnu/libgcc_s.so.1 ]] ; then
 		LD_PRELOAD=/lib/aarch64-linux-gnu/libgcc_s.so.1 vncserver $DISPLAY $KASMVNC_HW3D -drinode $DRINODE -depth $VNC_COL_DEPTH -geometry $VNC_RESOLUTION -websocketPort $NO_VNC_PORT -httpd ${KASM_VNC_PATH}/www -sslOnly -FrameRate=$MAX_FRAME_RATE -interface 0.0.0.0 -BlacklistThreshold=0 -FreeKeyMappings $VNCOPTIONS $KASM_SVC_SEND_CUT_TEXT $KASM_SVC_ACCEPT_CUT_TEXT
 	else
 		vncserver $DISPLAY $KASMVNC_HW3D -drinode $DRINODE -depth $VNC_COL_DEPTH -geometry $VNC_RESOLUTION -websocketPort $NO_VNC_PORT -httpd ${KASM_VNC_PATH}/www -sslOnly -FrameRate=$MAX_FRAME_RATE -interface 0.0.0.0 -BlacklistThreshold=0 -FreeKeyMappings $VNCOPTIONS $KASM_SVC_SEND_CUT_TEXT $KASM_SVC_ACCEPT_CUT_TEXT
@@ -75,6 +75,16 @@ function start_kasmvnc (){
 
 	KASM_PROCS['kasmvnc']=$(cat $HOME/.vnc/*${DISPLAY_NUM}.pid)
 
+	#Disable X11 Screensaver
+	if [ "${DISTRO}" != "alpine" ]; then
+		echo "Disabling X Screensaver Functionality"
+		xset -dpms
+		xset s off
+		xset q
+	else
+		echo "Disabling of X Screensaver Functionality for $DISTRO is not required."
+	fi
+
 	if [[ $DEBUG == true ]]; then
 	  echo -e "\n------------------ Started Websockify  ----------------------------"
 	  echo "Websockify PID: ${KASM_PROCS['kasmvnc']}";

src/ubuntu/install/xfce/install_xfce_ui.sh

@@ -10,19 +10,6 @@ disable_epel_nss_wrapper_that_breaks_firefox() {
   yum-config-manager --setopt=epel.exclude=nss_wrapper --save
 }
 
-config_xinit_disable_screensaver() {
-  mkdir -p /etc/X11/xinit/xinitrc.d/
-  cat >/etc/X11/xinit/xinitrc.d/disable_screensaver.sh <<EOL
-#!/bin/sh
-set -x
-xset -dpms
-xset s off
-xset q
-EOL
-
-chmod +x /etc/X11/xinit/xinitrc.d/disable_screensaver.sh
-}
-
 replace_default_xinit() {
 
   mkdir -p /etc/X11/xinit
@@ -173,13 +160,10 @@ else
     /tmp/*
 fi
 
-if [[ "${DISTRO}" == @(centos|oracle7|oracle8|fedora37|oracle9|rockylinux9|rockylinux8|almalinux8|almalinux9) ]]; then
+if [[ "${DISTRO}" == @(centos|oracle7|oracle8|fedora37|oracle9|rockylinux9|rockylinux8|almalinux8|almalinux9|alpine) ]]; then
-  config_xinit_disable_screensaver
-elif [ "${DISTRO}" == "alpine" ]; then
   echo ""
 else
   replace_default_xinit
-  config_xinit_disable_screensaver
   if [ "${START_XFCE4}" == "1" ] ; then
     replace_default_99x11_common_start
   fi