summaryrefslogtreecommitdiffstats
path: root/core/modules/xorg
diff options
context:
space:
mode:
authorSimon Rettberg2020-10-05 12:22:54 +0200
committerSimon Rettberg2020-10-05 12:22:54 +0200
commite3ba4c401c313f601d3dd048147528641d1c8ade (patch)
tree966d774ed93847078870a6398ab7d83affff6f1f /core/modules/xorg
parent[run-virt] is_command_runnnnning (diff)
downloadmltk-e3ba4c401c313f601d3dd048147528641d1c8ade.tar.gz
mltk-e3ba4c401c313f601d3dd048147528641d1c8ade.tar.xz
mltk-e3ba4c401c313f601d3dd048147528641d1c8ade.zip
[xorg] Improve intel matching for IRIS fix
For some reason, on some intel NUCs, the nvidia driver is attempted to be loaded even though it doesn't even exist. The old grep matched that and then failed to apply the fix.
Diffstat (limited to 'core/modules/xorg')
-rw-r--r--core/modules/xorg/data/etc/X11/Xsession.d/10-fix-vmware-3d2
1 files changed, 1 insertions, 1 deletions
diff --git a/core/modules/xorg/data/etc/X11/Xsession.d/10-fix-vmware-3d b/core/modules/xorg/data/etc/X11/Xsession.d/10-fix-vmware-3d
index 780a4e81..eebf51d3 100644
--- a/core/modules/xorg/data/etc/X11/Xsession.d/10-fix-vmware-3d
+++ b/core/modules/xorg/data/etc/X11/Xsession.d/10-fix-vmware-3d
@@ -6,7 +6,7 @@
# and newer, which unfortunately completely breaks 3D acceleration with
# VMware 15.5.6 (as of 2020-08-04 with Mesa 20.0 + Ubuntu 20.04 as base)
-drivers="$( grep -Po '(?<=LoadModule: "|Matched )[^"]*' /var/log/Xorg.0.log )"
+drivers="$( grep -Po '(?<=modules/drivers/)\S+(?=_drv\.so)' /var/log/Xorg.0.log )"
intel=false
other=false
for driver in $drivers; do