From 75c2df31157b4b86e9a712e0d9a866152ffab516 Mon Sep 17 00:00:00 2001
From: "Josh.5" <jsunnex@gmail.com>
Date: Tue, 8 Feb 2022 14:36:19 +1300
Subject: [PATCH] Dont run VNC or apply the VNC audio patch when running as a
 secondary container

---
 .../etc/cont-init.d/70-configure_vnc_audio.sh | 46 ++++++++++---------
 .../etc/cont-init.d/95-configure_secondary.sh |  9 ++++
 2 files changed, 33 insertions(+), 22 deletions(-)

diff --git a/overlay/etc/cont-init.d/70-configure_vnc_audio.sh b/overlay/etc/cont-init.d/70-configure_vnc_audio.sh
index 12bb32e..b893a6e 100644
--- a/overlay/etc/cont-init.d/70-configure_vnc_audio.sh
+++ b/overlay/etc/cont-init.d/70-configure_vnc_audio.sh
@@ -1,30 +1,32 @@
 
 echo "**** Configure VNC audio ****"
 
-if [[ "${ENABLE_VNC_AUDIO}" == "true" ]]; then
-    # Credits for this audio patch:
-    #   - https://github.com/novnc/noVNC/issues/302
-    #   - https://github.com/vexingcodes/dwarf-fortress-docker
-    #   - https://github.com/calebj/noVNC
-    if [ -f /opt/noVNC/audio.patch ]; then
-        echo "Patching noVNC with audio websocket"
-        pushd /opt/noVNC/ &> /dev/null
-        patch -p1 --input=/opt/noVNC/audio.patch --batch --quiet
-        popd &> /dev/null
-        rm /opt/noVNC/audio.patch
-    fi
-    # Enable supervisord script
-    sed -i 's|^autostart.*=.*$|autostart=true|' /etc/supervisor.d/vnc-audio.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
+        #   - https://github.com/vexingcodes/dwarf-fortress-docker
+        #   - https://github.com/calebj/noVNC
+        if [ -f /opt/noVNC/audio.patch ]; then
+            echo "Patching noVNC with audio websocket"
+            pushd /opt/noVNC/ &> /dev/null
+            patch -p1 --input=/opt/noVNC/audio.patch --batch --quiet
+            popd &> /dev/null
+            rm /opt/noVNC/audio.patch
+        fi
+        # Enable supervisord script
+        sed -i 's|^autostart.*=.*$|autostart=true|' /etc/supervisor.d/vnc-audio.ini
 
-    # Remove x11vnc from applications menu
-    if !  grep -q 'Hidden=true' /usr/share/applications/x11vnc.desktop; then
-        echo 'Hidden=true' >> /usr/share/applications/x11vnc.desktop
+        # Remove x11vnc from applications menu
+        if !  grep -q 'Hidden=true' /usr/share/applications/x11vnc.desktop; then
+            echo 'Hidden=true' >> /usr/share/applications/x11vnc.desktop
+        fi
+    else
+        echo "Disable audio stream"
+        echo "Disable audio websock"
+        # Disable supervisord script
+        sed -i 's|^autostart.*=.*$|autostart=false|' /etc/supervisor.d/vnc-audio.ini
     fi
-else
-    echo "Disable audio stream"
-    echo "Disable audio websock"
-    # Disable supervisord script
-    sed -i 's|^autostart.*=.*$|autostart=false|' /etc/supervisor.d/vnc-audio.ini
 fi
 
 echo "DONE"
diff --git a/overlay/etc/cont-init.d/95-configure_secondary.sh b/overlay/etc/cont-init.d/95-configure_secondary.sh
index 7140f2d..b7a9a30 100644
--- a/overlay/etc/cont-init.d/95-configure_secondary.sh
+++ b/overlay/etc/cont-init.d/95-configure_secondary.sh
@@ -12,6 +12,13 @@ if [ "${MODE}" == "s" ] | [ "${MODE}" == "secondary" ]; then
     # Disable vnc
     echo " - Disable vnc"
     sed -i 's|^autostart.*=.*$|autostart=false|' /etc/supervisor.d/vnc.ini
+    # Disable vnc
+    echo " - Disable vnc"
+    sed -i 's|^autostart.*=.*$|autostart=false|' /etc/supervisor.d/vnc.ini
+    # Disable vnc-audio
+    echo " - Disable vnc audio stream"
+    echo " - Disable vnc audio websock"
+    sed -i 's|^autostart.*=.*$|autostart=false|' /etc/supervisor.d/vnc-audio.ini
     # Disable xorg
     echo " - Disable xorg"
     sed -i 's|^autostart.*=.*$|autostart=false|' /etc/supervisor.d/xorg.ini
@@ -26,3 +33,5 @@ if [ "${MODE}" == "s" ] | [ "${MODE}" == "secondary" ]; then
     echo " - Enable udev"
     sed -i 's|^autostart.*=.*$|autostart=true|' /etc/supervisor.d/udev.ini
 fi
+
+echo "DONE"