Improvements toward working with a shared host X server

2022-01-12 09:16:06 +13:00
parent 55dfce5e6a
commit 8e877e3762
17 changed files with 336 additions and 218 deletions
--- a/overlay/entrypoint.sh
+++ b/overlay/entrypoint.sh
@@ -5,7 +5,7 @@
 # File Created: Saturday, 8th January 2022 7:08:46 pm
 # Author: Josh.5 (jsunnex@gmail.com)
 # -----
-# Last Modified: Tuesday, 11th January 2022 1:02:16 am
+# Last Modified: Tuesday, 11th January 2022 8:44:17 pm
 # Modified By: Josh.5 (jsunnex@gmail.com)
 ###

@@ -44,4 +44,6 @@ for user_init_script in ${USER_HOME}/init.d/*.sh ; do
 done

 echo "**** Starting supervisord ****";
-exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf --nodaemon
+mkdir -p /var/log/supervisor
+chmod a+rw /var/log/supervisor
+exec /usr/bin/supervisord -c /etc/supervisor/supervisord.conf --nodaemon --user root
--- a/overlay/etc/supervisor/conf.d/audio.conf
+++ b/overlay/etc/supervisor/conf.d/audio.conf
@@ -0,0 +1,32 @@
+
+[program:pulseaudio]
+autostart=true
+priority=10
+directory=/
+command=/usr/bin/pulseaudio -vvvv --disallow-module-loading --disallow-exit --exit-idle-time=-1
+user=%(ENV_USER)s
+environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s"
+autorestart=true
+stopsignal=QUIT
+stdout_logfile=/home/%(ENV_USER)s/.cache/log/pulseaudio.log
+stderr_logfile=/home/%(ENV_USER)s/.cache/log/pulseaudio.err
+
+[program:audiostream]
+autostart=true
+priority=10
+command=tcpserver localhost 5901 gst-launch-1.0 -q pulsesrc server=/tmp/pulseaudio.socket ! audio/x-raw, channels=2, rate=24000 ! cutter ! opusenc ! webmmux ! fdsink fd=1
+user=%(ENV_USER)s
+autorestart=true
+stopsignal=QUIT
+stdout_logfile=/home/%(ENV_USER)s/.cache/log/audiostream.log
+stderr_logfile=/home/%(ENV_USER)s/.cache/log/audiostream.err
+
+[program:audiowebsock]
+autostart=true
+priority=10
+command=/usr/local/bin/websockify 32123 localhost:5901
+user=%(ENV_USER)s
+autorestart=true
+stopsignal=QUIT
+stdout_logfile=/home/%(ENV_USER)s/.cache/log/audiowebsock.log
+stderr_logfile=/home/%(ENV_USER)s/.cache/log/audiowebsock.err
--- a/overlay/etc/supervisor/conf.d/dbus.conf
+++ b/overlay/etc/supervisor/conf.d/dbus.conf
@@ -0,0 +1,10 @@
+
+[program:dbus]
+autostart=true
+priority=10
+directory=/
+command=dbus-daemon --config-file=/usr/share/dbus-1/system.conf --nofork --nopidfile
+user=%(ENV_USER)s
+environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s"
+autorestart=true
+stopsignal=QUIT
--- a/overlay/etc/supervisor/conf.d/services.conf
+++ b/overlay/etc/supervisor/conf.d/services.conf
@@ -1,130 +0,0 @@
-[supervisord]
-user=root
-nodaemon=true
-
-[program:ssh]
-autostart=true
-priority=10
-directory=/
-command=/usr/sbin/sshd -D
-user=root
-autorestart=true
-stopsignal=QUIT
-
-[program:dbus]
-autostart=true
-priority=10
-directory=/
-command=dbus-daemon --config-file=/usr/share/dbus-1/system.conf --nofork --nopidfile
-user=%(ENV_USER)s
-environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s"
-autorestart=true
-stopsignal=QUIT
-
-[program:pulseaudio]
-autostart=true
-priority=10
-directory=/
-command=/usr/bin/pulseaudio -vvvv --disallow-module-loading --disallow-exit --exit-idle-time=-1
-user=%(ENV_USER)s
-environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s"
-autorestart=true
-stopsignal=QUIT
-stdout_logfile=/home/%(ENV_USER)s/.cache/log/pulseaudio.log
-stderr_logfile=/home/%(ENV_USER)s/.cache/log/pulseaudio.err
-
-[program:audiostream]
-autostart=true
-priority=10
-command=tcpserver localhost 5901 gst-launch-1.0 -q pulsesrc server=/tmp/pulseaudio.socket ! audio/x-raw, channels=2, rate=24000 ! cutter ! opusenc ! webmmux ! fdsink fd=1
-autorestart=true
-stopsignal=QUIT
-stdout_logfile=/home/%(ENV_USER)s/.cache/log/audiostream.log
-stderr_logfile=/home/%(ENV_USER)s/.cache/log/audiostream.err
-
-[program:audiowebsock]
-autostart=true
-priority=10
-command=/usr/local/bin/websockify 32123 localhost:5901
-autorestart=true
-stopsignal=QUIT
-stdout_logfile=/home/%(ENV_USER)s/.cache/log/audiowebsock.log
-stderr_logfile=/home/%(ENV_USER)s/.cache/log/audiowebsock.err
-
-[program:xorg]
-autostart=true
-priority=20
-directory=/
-command=/usr/bin/Xorg vt7 -novtswitch -sharevts -dpi "%(ENV_DISPLAY_DPI)s" +extension "MIT-SHM" %(ENV_DISPLAY)s
-#command=/usr/bin/Xorg -novtswitch -sharevts -dpi "%(ENV_DISPLAY_DPI)s" +extension "MIT-SHM" "%(ENV_DISPLAY)s"
-user=%(ENV_USER)s
-environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s",XDG_RUNTIME_DIR="/tmp/xdg",RUNLEVEL="3"
-autorestart=true
-stopsignal=QUIT
-stdout_logfile=/home/%(ENV_USER)s/.cache/log/xorg.log
-stderr_logfile=/home/%(ENV_USER)s/.cache/log/xorg.err
-
-# Dont use xvfb as it does not work with nvidia X11 configuration
-# [program:xvfb]
-# autostart=false
-# priority=20
-# directory=/
-# command=/usr/bin/Xvfb %(ENV_DISPLAY)s -screen 0 1920x1080x24
-# user=%(ENV_USER)s
-# environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s"
-# autorestart=true
-# stopsignal=QUIT
-# stdout_logfile=/home/%(ENV_USER)s/.cache/log/xvfb.log
-# stderr_logfile=/home/%(ENV_USER)s/.cache/log/xvfb.err
-
-[program:x11vnc]
-autostart=true
-priority=30
-directory=/
-#command=/usr/bin/x11vnc -display %(ENV_DISPLAY)s -xkb
-command=/usr/bin/x11vnc -display %(ENV_DISPLAY)s -rfbport 5900 -shared -forever
-user=%(ENV_USER)s
-autorestart=true
-stopsignal=QUIT
-stdout_logfile=/home/%(ENV_USER)s/.cache/log/x11vnc.log
-stderr_logfile=/home/%(ENV_USER)s/.cache/log/x11vnc.err
-
-[program:de]
-autostart=true
-priority=50
-directory=/home/%(ENV_USER)s
-command=/usr/bin/startxfce4
-#command=/usr/bin/mate-session
-#command=/usr/bin/startlxqt
-#command=/usr/bin/dbus-launch startxfce4
-#command=/usr/bin/dbus-launch xfce4-session
-#command=/usr/bin/dbus-launch startplasma-x11
-user=%(ENV_USER)s
-autorestart=true
-stopsignal=QUIT
-environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s"
-stdout_logfile=/home/%(ENV_USER)s/.cache/log/de.log
-stderr_logfile=/home/%(ENV_USER)s/.cache/log/de.err
-
-## Experimental launch directly to steam big picture... (this is cool, but not ideal for headless)
-# [program:steam]
-# autostart=true
-# priority=50
-# directory=/home/%(ENV_USER)s
-# command=/usr/bin/steam -bigpicture
-# user=%(ENV_USER)s
-# autorestart=true
-# stopsignal=QUIT
-# environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s"
-# stdout_logfile=/home/%(ENV_USER)s/.cache/log/steam.log
-# stderr_logfile=/home/%(ENV_USER)s/.cache/log/steam.err
-
-[program:novnc]
-autostart=true
-priority=100
-command=/opt/noVNC/utils/launch.sh --vnc localhost:5900 --listen 8083
-#command=/usr/share/novnc/utils/launch.sh --vnc localhost:5900 --listen 8083
-#command=/usr/local/bin/websockify -D --web=/usr/share/novnc/ --cert=/etc/ssl/novnc.pem 8083 localhost:5900
-user=%(ENV_USER)s
-environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s"
-autorestart=true
--- a/overlay/etc/supervisor/conf.d/sshd.conf
+++ b/overlay/etc/supervisor/conf.d/sshd.conf
@@ -0,0 +1,9 @@
+
+[program:ssh]
+autostart=true
+priority=10
+directory=/
+command=/usr/sbin/sshd -D
+user=root
+autorestart=true
+stopsignal=QUIT
--- a/overlay/etc/supervisor/conf.d/steam.conf
+++ b/overlay/etc/supervisor/conf.d/steam.conf
@@ -0,0 +1,13 @@
+
+# Optionally launch directly to steam big picture (disabled by default)
+[program:steam]
+autostart=false
+priority=50
+directory=/home/%(ENV_USER)s
+command=/usr/game/steam -bigpicture
+user=%(ENV_USER)s
+autorestart=true
+stopsignal=QUIT
+environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s"
+stdout_logfile=/home/%(ENV_USER)s/.cache/log/steam.log
+stderr_logfile=/home/%(ENV_USER)s/.cache/log/steam.err
--- a/overlay/etc/supervisor/conf.d/vnc.conf
+++ b/overlay/etc/supervisor/conf.d/vnc.conf
@@ -0,0 +1,19 @@
+
+[program:x11vnc]
+autostart=true
+priority=30
+directory=/
+command=/usr/bin/x11vnc -display %(ENV_DISPLAY)s -rfbport 5900 -shared -forever
+user=%(ENV_USER)s
+autorestart=true
+stopsignal=QUIT
+stdout_logfile=/home/%(ENV_USER)s/.cache/log/x11vnc.log
+stderr_logfile=/home/%(ENV_USER)s/.cache/log/x11vnc.err
+
+[program:novnc]
+autostart=true
+priority=30
+command=/opt/noVNC/utils/launch.sh --vnc localhost:5900 --listen 8083
+user=%(ENV_USER)s
+environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s"
+autorestart=true
--- a/overlay/etc/supervisor/conf.d/xfce4.conf
+++ b/overlay/etc/supervisor/conf.d/xfce4.conf
@@ -0,0 +1,12 @@
+
+[program:xfce4]
+autostart=true
+priority=50
+directory=/home/%(ENV_USER)s
+command=/usr/bin/startxfce4
+user=%(ENV_USER)s
+autorestart=true
+stopsignal=QUIT
+environment=HOME="/home/%(ENV_USER)s",USER="%(ENV_USER)s",DISPLAY="%(ENV_DISPLAY)s"
+stdout_logfile=/home/%(ENV_USER)s/.cache/log/de.log
+stderr_logfile=/home/%(ENV_USER)s/.cache/log/de.err
--- a/overlay/etc/supervisor/conf.d/xorg.conf
+++ b/overlay/etc/supervisor/conf.d/xorg.conf
@@ -0,0 +1,12 @@
+
+[program:xorg]
+autostart=false
+priority=20
+directory=/
+command=/usr/bin/start-xorg.sh
+user=root
+environment=DISPLAY="%(ENV_DISPLAY)s",DISPLAY_DPI="%(ENV_DISPLAY_DPI)s",XDG_RUNTIME_DIR="/tmp/.X11-unix"
+autorestart=true
+stopsignal=QUIT
+stdout_logfile=/var/log/supervisor/xorg.log
+stderr_logfile=/var/log/supervisor/xorg.err
--- a/overlay/scripts/30-configure_dbus.sh
+++ b/overlay/scripts/30-configure_dbus.sh
@@ -0,0 +1,26 @@
+
+# Configure dbus
+echo "**** Configure container dbus ****";
+if [[ "${HOST_DBUS}" == "true" ]]; then
+    echo "Container configured to use the host dbus";
+    # Disable supervisord script
+    sed -i 's|^autostart.*=.*$|autostart=false|' /etc/supervisor/conf.d/dbus.conf
+else
+    echo "Container configured to run its own dbus";
+    # Enable supervisord script
+    sed -i 's|^autostart.*=.*$|autostart=true|' /etc/supervisor/conf.d/dbus.conf
+    # Configure dbus to run as USER
+    sed -i "/  <user>/c\  <user>${USER}</user>" /usr/share/dbus-1/system.conf
+    # Remove old dbus session
+    rm -rf ${USER_HOME}/.dbus/session-bus/* 2> /dev/null
+    # Remove old dbus pids
+    mkdir -p /var/run/dbus
+    chown -R ${PUID}:${PGID} /var/run/dbus/
+    chmod -R 770 /var/run/dbus/
+    # Generate a dbus machine ID
+    dbus-uuidgen > /var/lib/dbus/machine-id
+    # Remove old lockfiles
+    find /var/run/dbus -name "pid" -exec rm -f {} \;
+fi
+
+echo "DONE"
--- a/overlay/scripts/30-configure_system_paths.sh
+++ b/overlay/scripts/30-configure_system_paths.sh
@@ -1,32 +0,0 @@
-# Configure system paths
-echo "**** Configure system paths ****";
-sed -i "/  <user>/c\  <user>${USER}</user>" /usr/share/dbus-1/system.conf
-if [ ! -d /tmp/xdg ]; then
-	mkdir -p /tmp/xdg
-fi
-
-echo "Configure dbus";
-# Remove old dbus session
-rm -rf ${USER_HOME}/.dbus/session-bus/* 2> /dev/null
-# Remove old dbus pids
-mkdir -p /var/run/dbus
-chown -R ${PUID}:${PGID} /var/run/dbus/
-chmod -R 770 /var/run/dbus/
-# Generate a dbus machine ID
-dbus-uuidgen > /var/lib/dbus/machine-id
-
-echo "Configure X Windows context"
-chown -R ${PUID}:${PGID} /tmp/xdg
-chmod -R 0700 /tmp/xdg
-
-echo "Configure X Windows session"
-rm -rfv /tmp/.ICE-unix*
-mkdir -p /tmp/.ICE-unix
-chown root:root /tmp/.ICE-unix/
-chmod 1777 /tmp/.ICE-unix/
-
-echo "Remove old lockfiles"
-find /var/run/dbus -name "pid" -exec rm -f {} \;
-find /tmp -name ".X99*" -exec rm -f {} \;
-
-echo "DONE"
--- a/overlay/scripts/80-configure_nvidia_driver.sh
+++ b/overlay/scripts/80-configure_nvidia_driver.sh
@@ -19,7 +19,7 @@ function download_driver {
    mkdir -p ${USER_HOME}/.cache/nvidia

    if [[ ! -f "${USER_HOME}/.cache/nvidia/NVIDIA_${nvidia_host_driver_version}.run" ]]; then
-        echo "Downloading driver"
+        echo "Downloading driver v${nvidia_host_driver_version}"
        wget -q --show-progress --progress=bar:force:noscroll \
            -O /tmp/NVIDIA.run \
            http://download.nvidia.com/XFree86/Linux-x86_64/${nvidia_host_driver_version}/NVIDIA-Linux-x86_64-${nvidia_host_driver_version}.run
@@ -32,12 +32,12 @@ function download_driver {
 function install_driver {
    # Check here if the currently installed version matches using nvidia-settings
    nvidia_settings_version=$(nvidia-settings --version 2> /dev/null | grep version | cut -d ' ' -f 4)
-    [[ "${nvidia_settings_version}x" == "${nvidia_host_driver_version}x" ]] && return 0
+    [[ "${nvidia_settings_version}x" == "${nvidia_host_driver_version}x" ]] && return 0;

    # Download the driver (if it does not yet exist locally)
    download_driver

-    echo "Installing driver"
+    echo "Installing driver v${nvidia_host_driver_version} to match what is running on the host"
    chmod +x ${USER_HOME}/.cache/nvidia/NVIDIA_${nvidia_host_driver_version}.run
    ${USER_HOME}/.cache/nvidia/NVIDIA_${nvidia_host_driver_version}.run \
        --silent \
--- a/overlay/scripts/90-configure_xorg.sh
+++ b/overlay/scripts/90-configure_xorg.sh
@@ -25,13 +25,6 @@ fi

 # Configure a NVIDIA X11 config
 function configure_nvidia_x_server {
-    # Configure x to be run by anyone
-    if grep -Fxq "allowed_users=console" /etc/X11/Xwrapper.config; then
-        echo "Configure Xwrapper.config"
-        sed -i "s/allowed_users=console/allowed_users=anybody/" /etc/X11/Xwrapper.config
-    fi
-
-    # Configure xorg for NVIDIA
    echo "Configuring X11 with GPU ID: '${gpu_select}'"
    nvidia_gpu_hex_id=$(nvidia-smi --format=csv --query-gpu=pci.bus_id --id="${gpu_select}" 2> /dev/null | sed -n 2p)
    IFS=":." ARR_ID=(${nvidia_gpu_hex_id})
@@ -45,12 +38,44 @@ function configure_nvidia_x_server {
    sed -i '/Section\s\+"Monitor"/a\    '"${MODELINE}" /etc/X11/xorg.conf
 }

+# Allow anybody for running x server
+function configure_x_server {
+    # Configure x to be run by anyone
+    if grep -Fxq "allowed_users=console" /etc/X11/Xwrapper.config; then
+        echo "Configure Xwrapper.config"
+        sed -i "s/allowed_users=console/allowed_users=anybody/" /etc/X11/Xwrapper.config
+    fi
+
+    # Ensure the X socket path exists
+    if [ ! -d /tmp/.X11-unix ]; then
+        mkdir -p /tmp/.X11-unix
+    fi
+
+    # Check if this container is being run as a secondary instance
+    if [ "${MODE}" == "p" ] | [ "${MODE}" == "primary" ]; then
+        echo "Configure container as primary the X server"
+        # Enable supervisord script
+        sed -i 's|^autostart.*=.*$|autostart=true|' /etc/supervisor/conf.d/xorg.conf
+    elif [ "${MODE}" == "fb" ] | [ "${MODE}" == "framebuffer" ]; then
+        echo "Configure container to use a virtual framebuffer as the X server"
+        # Disable supervisord script
+        sed -i 's|^autostart.*=.*$|autostart=false|' /etc/supervisor/conf.d/xorg.conf
+    else
+        echo "Configure container as secondary and do not run an X server"
+        # Disable supervisord script
+        sed -i 's|^autostart.*=.*$|autostart=false|' /etc/supervisor/conf.d/xorg.conf
+    fi
+    # Make startup script executable
+    chmod +x /usr/bin/start-xorg.sh
+}
+

 if [[ -z ${nvidia_gpu_hex_id} ]]; then
    echo "**** Generate default xorg.conf ****";
-    # TODO: Configure xorg.conf with no NVIDIA GPU
+    configure_x_server
 else
    echo "**** Generate NVIDIA xorg.conf ****";
+    configure_x_server
    configure_nvidia_x_server
 fi

--- a/overlay/usr/bin/start-xorg.sh
+++ b/overlay/usr/bin/start-xorg.sh
@@ -0,0 +1,30 @@
+#!/usr/bin/env bash
+###
+# File: start-xorg.sh
+# Project: bin
+# File Created: Tuesday, 11th January 2022 8:28:52 pm
+# Author: Josh.5 (jsunnex@gmail.com)
+# -----
+# Last Modified: Tuesday, 11th January 2022 9:38:51 pm
+# Modified By: Josh.5 (jsunnex@gmail.com)
+###
+
+DISPLAY=${DISPLAY:-:55}
+DISPLAY_DPI=${DPI:-:96}
+XDG_RUNTIME_DIR=${XDG_RUNTIME_DIR:-/tmp/.X11-unix}
+
+
+# Clear out old lock files
+display_file=/tmp/.X11-unix/X${DISPLAY#:}
+if [ -S ${display_file} ]; then
+  LOG "Removing ${display_file} before starting"
+  rm -f /tmp/.X${DISPLAY#:}-lock
+  rm ${display_file}
+fi
+
+
+/usr/bin/Xorg -ac -noreset -novtswitch -sharevts -dpi "${DISPLAY_DPI}" +extension "GLX" +extension "RANDR" +extension "RENDER" vt7 "${DISPLAY}"
+# /usr/bin/Xorg -ac -noreset -novtswitch -sharevts -dpi "${DISPLAY_DPI}" +extension "GLX" +extension "RANDR" +extension "RENDER" +extension "MIT-SHM" vt7 "${DISPLAY}"
+# /usr/bin/Xorg -novtswitch -sharevts -dpi "${DISPLAY_DPI}" +extension "MIT-SHM" vt7 ${DISPLAY}
+# /usr/bin/Xorg -novtswitch -sharevts -dpi "${DISPLAY_DPI}" +extension "MIT-SHM" "${DISPLAY}"
+# /usr/bin/Xorg -ac -noreset +extension GLX +extension RANDR +extension RENDER vt7 "${DISPLAY}"