From 5d2ece84dcc26804c63637adfd6e085550067990 Mon Sep 17 00:00:00 2001
From: "Josh.5" <jsunnex@gmail.com>
Date: Sat, 17 Sep 2022 17:46:45 +1200
Subject: [PATCH] Disable VNC if 'WEB_UI_MODE' is not "vnc"

Se the new variable to default to "vnc"
---
 Dockerfile                                               | 2 +-
 .../{70-configure_vnc_audio.sh => 70-configure_vnc.sh}   | 9 +++++++--
 overlay/etc/cont-init.d/90-configure_xorg.sh             | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)
 rename overlay/etc/cont-init.d/{70-configure_vnc_audio.sh => 70-configure_vnc.sh} (84%)

diff --git a/Dockerfile b/Dockerfile
index d70bfef..5a2f9c7 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -441,7 +441,7 @@ ENV \
 # Set container configuration environment variables
 ENV \
     MODE="primary" \
-    ENABLE_VNC_AUDIO="true"
+    WEB_UI_MODE="vnc" \
 
 # Configure required ports
 ENV \
diff --git a/overlay/etc/cont-init.d/70-configure_vnc_audio.sh b/overlay/etc/cont-init.d/70-configure_vnc.sh
similarity index 84%
rename from overlay/etc/cont-init.d/70-configure_vnc_audio.sh
rename to overlay/etc/cont-init.d/70-configure_vnc.sh
index 8d3fcdd..b920fcb 100644
--- a/overlay/etc/cont-init.d/70-configure_vnc_audio.sh
+++ b/overlay/etc/cont-init.d/70-configure_vnc.sh
@@ -1,7 +1,11 @@
 
-echo "**** Configure VNC audio ****"
+echo "**** Configure VNC ****"
+
+if ([ ${WEB_UI_MODE} = "vnc" ] && [ "${MODE}" != "s" ] && [ "${MODE}" != "secondary" ]); then
+    
+    echo "Enable VNC server"
+    sed -i 's|^autostart.*=.*$|autostart=true|' /etc/supervisor.d/vnc.ini
 
-if [ "${MODE}" != "s" ] & [ "${MODE}" != "secondary" ]; then
     if [[ "${ENABLE_VNC_AUDIO}" == "true" ]]; then
         # Credits for this audio patch:
         #   - https://github.com/novnc/noVNC/issues/302
@@ -30,6 +34,7 @@ if [ "${MODE}" != "s" ] & [ "${MODE}" != "secondary" ]; then
         # Disable supervisord script
         sed -i 's|^autostart.*=.*$|autostart=false|' /etc/supervisor.d/vnc-audio.ini
     fi
+
 fi
 
 echo "DONE"
diff --git a/overlay/etc/cont-init.d/90-configure_xorg.sh b/overlay/etc/cont-init.d/90-configure_xorg.sh
index 3f8cec3..0660be0 100644
--- a/overlay/etc/cont-init.d/90-configure_xorg.sh
+++ b/overlay/etc/cont-init.d/90-configure_xorg.sh
@@ -72,7 +72,7 @@ function configure_x_server {
     chmod +x /usr/bin/start-xorg.sh
 }
 
-if [ "${MODE}" != "s" ] & [ "${MODE}" != "secondary" ]; then
+if ([ "${MODE}" != "s" ] && [ "${MODE}" != "secondary" ]); then
     if [[ -z ${nvidia_gpu_hex_id} ]]; then
         echo "**** Generate default xorg.conf ****";
         configure_x_server