From e3ba4c401c313f601d3dd048147528641d1c8ade Mon Sep 17 00:00:00 2001
From: Simon Rettberg
Date: Mon, 5 Oct 2020 12:22:54 +0200
Subject: [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.
---
 core/modules/xorg/data/etc/X11/Xsession.d/10-fix-vmware-3d | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'core/modules/xorg/data')

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
-- 
cgit v1.2.3-55-g7522