diff options
3 files changed, 7 insertions, 14 deletions
diff --git a/core/modules/remote-access/data/opt/openslx/remote-access/xorg-virtual.conf b/core/modules/remote-access/data/opt/openslx/remote-access/xorg-virtual.conf index 7b5f40cf..a69beddc 100644 --- a/core/modules/remote-access/data/opt/openslx/remote-access/xorg-virtual.conf +++ b/core/modules/remote-access/data/opt/openslx/remote-access/xorg-virtual.conf @@ -1,5 +1,6 @@ -Section "Device" +Section "OutputClass" Identifier "Device0" + MatchDriver "%DRIVER%" Driver "%DRIVER%" Option "VirtualHeads" "1" Option "ModeValidation" "AllowNonEdidModes" diff --git a/core/modules/remote-access/data/opt/openslx/scripts/systemd-remote_x_config b/core/modules/remote-access/data/opt/openslx/scripts/systemd-remote_x_config index dc28aa5a..ffa7caf2 100755 --- a/core/modules/remote-access/data/opt/openslx/scripts/systemd-remote_x_config +++ b/core/modules/remote-access/data/opt/openslx/scripts/systemd-remote_x_config @@ -4,15 +4,6 @@ [ -n "$SLX_REMOTE_VNC" ] || exit 0 # Nothing to do -# Force modesetting driver on newer intel models -vendor="$( < /proc/cpuinfo sed 's/\s//g' | awk -F: '$1 == "vendor_id" {print $2; exit}' )" -cpufamily="$( < /proc/cpuinfo sed 's/\s//g' | awk -F: '$1 == "cpufamily" {print $2; exit}' )" -model="$( < /proc/cpuinfo sed 's/\s//g' | awk -F: '$1 == "model" {print $2; exit}' )" - -if [ "$vendor" = "GenuineIntel" ] && [ "$cpufamily" -eq 6 ] && [ "$model" -gt 60 ]; then - rm -- "/usr/lib/xorg/modules/drivers/intel_drv.so" -fi - # Disable all input drivers cp "/opt/openslx/remote-access/xorg-noinput.conf" "/etc/X11/xorg.conf.d/16-remote-access-noinput.conf" diff --git a/core/modules/xorg/data/etc/X11/xorg.conf.d/40-nvidia-no-screens.conf b/core/modules/xorg/data/etc/X11/xorg.conf.d/40-nvidia-no-screens.conf index cc659286..cd4cc76b 100644 --- a/core/modules/xorg/data/etc/X11/xorg.conf.d/40-nvidia-no-screens.conf +++ b/core/modules/xorg/data/etc/X11/xorg.conf.d/40-nvidia-no-screens.conf @@ -1,5 +1,6 @@ -Section "Device" - Identifier "NoScreenNvidia" - Driver "nvidia" - Option "AllowEmptyInitialConfiguration" "true" +Section "OutputClass" + Identifier "NoScreenNvidia" + MatchDriver "nvidia" + Driver "nvidia" + Option "AllowEmptyInitialConfiguration" "true" EndSection |