maxscout/docker-steam-headless
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Dont run VNC or apply the VNC audio patch when running as a secondary container

Browse Source
This commit is contained in:
Josh.5
2022-02-08 14:36:19 +13:00
parent 168c46ae72
commit 75c2df3115
2 changed files with 33 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
overlay/etc/cont-init.d/70-configure_vnc_audio.sh
View File

@@ -1,30 +1,32 @@
echo "**** Configure VNC audio ****" echo "**** Configure VNC audio ****"
if [[ "${ENABLE_VNC_AUDIO}" == "true" ]]; then if [ "${MODE}" != "s" ] & [ "${MODE}" != "secondary" ]; then
# Credits for this audio patch: if [[ "${ENABLE_VNC_AUDIO}" == "true" ]]; then
# - https://github.com/novnc/noVNC/issues/302 # Credits for this audio patch:
# - https://github.com/vexingcodes/dwarf-fortress-docker # - https://github.com/novnc/noVNC/issues/302
# - https://github.com/calebj/noVNC # - https://github.com/vexingcodes/dwarf-fortress-docker
if [ -f /opt/noVNC/audio.patch ]; then # - https://github.com/calebj/noVNC
echo "Patching noVNC with audio websocket" if [ -f /opt/noVNC/audio.patch ]; then
pushd /opt/noVNC/ &> /dev/null echo "Patching noVNC with audio websocket"
patch -p1 --input=/opt/noVNC/audio.patch --batch --quiet pushd /opt/noVNC/ &> /dev/null
popd &> /dev/null patch -p1 --input=/opt/noVNC/audio.patch --batch --quiet
rm /opt/noVNC/audio.patch popd &> /dev/null
fi rm /opt/noVNC/audio.patch
# Enable supervisord script fi
sed -i 's|^autostart.*=.*$|autostart=true|' /etc/supervisor.d/vnc-audio.ini # Enable supervisord script
sed -i 's|^autostart.*=.*$|autostart=true|' /etc/supervisor.d/vnc-audio.ini
# Remove x11vnc from applications menu # Remove x11vnc from applications menu
if ! grep -q 'Hidden=true' /usr/share/applications/x11vnc.desktop; then if ! grep -q 'Hidden=true' /usr/share/applications/x11vnc.desktop; then
echo 'Hidden=true' >> /usr/share/applications/x11vnc.desktop 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 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 fi
echo "DONE" echo "DONE"

9
overlay/etc/cont-init.d/95-configure_secondary.sh
View File

@@ -12,6 +12,13 @@ if [ "${MODE}" == "s" ] | [ "${MODE}" == "secondary" ]; then
# Disable vnc # Disable vnc
echo " - Disable vnc" echo " - Disable vnc"
sed -i 's|^autostart.*=.*$|autostart=false|' /etc/supervisor.d/vnc.ini 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 # Disable xorg
echo " - Disable xorg" echo " - Disable xorg"
sed -i 's|^autostart.*=.*$|autostart=false|' /etc/supervisor.d/xorg.ini sed -i 's|^autostart.*=.*$|autostart=false|' /etc/supervisor.d/xorg.ini
@@ -26,3 +33,5 @@ if [ "${MODE}" == "s" ] | [ "${MODE}" == "secondary" ]; then
echo " - Enable udev" echo " - Enable udev"
sed -i 's|^autostart.*=.*$|autostart=true|' /etc/supervisor.d/udev.ini sed -i 's|^autostart.*=.*$|autostart=true|' /etc/supervisor.d/udev.ini
fi fi
echo "DONE"