Improvements toward working with a shared host X server

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"

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"

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 \

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