diff options
| author | Ray Strode <rstrode@redhat.com> | 2018-05-21 11:13:31 -0400 |
|---|---|---|
| committer | Ray Strode <rstrode@redhat.com> | 2021-04-12 16:57:53 -0400 |
| commit | d01859ff30fb1cbfd4b193b66b12fc864d5884c2 (patch) | |
| tree | bca81ae5a07326cf00d282274c76179a91ab54c9 | |
| parent | 2f2fa160373d0ff929e4dd111bd9050978f4026f (diff) | |
| download | gdm-d01859ff30fb1cbfd4b193b66b12fc864d5884c2.tar.gz | |
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)
| -rw-r--r-- | data/61-gdm.rules | 2 | ||||
| -rw-r--r-- | data/61-gdm.rules.in | 2 | ||||
| -rw-r--r-- | data/Makefile.am | 5 |
3 files changed, 7 insertions, 2 deletions
diff --git a/data/61-gdm.rules b/data/61-gdm.rules deleted file mode 100644 index 5ffa8b8a..00000000 --- a/data/61-gdm.rules +++ /dev/null @@ -1,2 +0,0 @@ -# disable Wayland on Cirrus chipsets -ATTR{vendor}=="0x1013", ATTR{device}=="0x00b8", ATTR{subsystem_vendor}=="0x1af4", ATTR{subsystem_device}=="0x1100", RUN+="/bin/sh -c '/bin/mkdir /run/gdm ; /usr/bin/printf \"[daemon]\nWaylandEnable=false\" >> /run/gdm/custom.conf'" diff --git a/data/61-gdm.rules.in b/data/61-gdm.rules.in new file mode 100644 index 00000000..de8e1790 --- /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 f69ec12d..65393c4f 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) \ |