[gdm/rhel-7.9: 7/51] data: change cirrus blacklist to use gdm-disable-wayland




commit d01859ff30fb1cbfd4b193b66b12fc864d5884c2
Author: Ray Strode <rstrode redhat com>
Date:   Mon May 21 11:13:31 2018 -0400

    data: change cirrus blacklist to use gdm-disable-wayland
    
    Now that we have a gdm-disable-wayland binary for disabling
    wayland at boot, we should use it.
    
    This commit changes the cirrus udev rule to use gdm-disable-wayland,
    rather than running sh and printf.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=796315
    
    (cherry picked from commit a913eea70342411247e770a91b75dd800941bb6e)

 data/61-gdm.rules    | 2 --
 data/61-gdm.rules.in | 2 ++
 data/Makefile.am     | 5 +++++
 3 files changed, 7 insertions(+), 2 deletions(-)
---
diff --git a/data/61-gdm.rules.in b/data/61-gdm.rules.in
new file mode 100644
index 000000000..de8e17903
--- /dev/null
+++ b/data/61-gdm.rules.in
@@ -0,0 +1,2 @@
+# disable Wayland on Cirrus chipsets
+ATTR{vendor}=="0x1013", ATTR{device}=="0x00b8", ATTR{subsystem_vendor}=="0x1af4", 
ATTR{subsystem_device}=="0x1100", RUN+="@libexecdir@/gdm-disable-wayland"
diff --git a/data/Makefile.am b/data/Makefile.am
index f69ec12dc..65393c4fa 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -150,6 +150,11 @@ endif
 udevrulesdir = $(prefix)/lib/udev/rules.d
 udevrules_DATA = 61-gdm.rules
 
+EXTRA_DIST += $(srcdir)/61-gdm.rules.in
+61-gdm.rules: $(srcdir)/61-gdm.rules.in
+       sed     -e 's,[@]libexecdir[@],$(libexecdir),g' \
+               < $< > $@.tmp && mv $@.tmp $@
+
 EXTRA_DIST +=                  \
        $(dconf_db_files)       \
        $(schemas_in_files)     \


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]