|
 |
795d2c |
From a9b82ca4a87315235924317c0fc48324a8b7cb9f Mon Sep 17 00:00:00 2001
|
|
|
795d2c |
From: Ray Strode <rstrode@redhat.com>
|
|
|
795d2c |
Date: Mon, 21 May 2018 11:13:31 -0400
|
|
|
795d2c |
Subject: [PATCH] data: change cirrus blacklist to use gdm-disable-wayland
|
|
|
795d2c |
|
|
|
795d2c |
Now that we have a gdm-disable-wayland binary for disabling
|
|
|
795d2c |
wayland at boot, we should use it.
|
|
|
795d2c |
|
|
|
795d2c |
This commit changes the cirrus udev rule to use gdm-disable-wayland,
|
|
|
795d2c |
rather than running sh and printf.
|
|
|
795d2c |
|
|
|
795d2c |
https://bugzilla.gnome.org/show_bug.cgi?id=796315
|
|
|
795d2c |
|
|
|
795d2c |
|
|
|
795d2c |
(cherry picked from commit a913eea70342411247e770a91b75dd800941bb6e)
|
|
|
795d2c |
---
|
|
|
795d2c |
data/61-gdm.rules | 2 --
|
|
|
795d2c |
data/61-gdm.rules.in | 2 ++
|
|
|
795d2c |
data/Makefile.am | 5 +++++
|
|
|
795d2c |
3 files changed, 7 insertions(+), 2 deletions(-)
|
|
|
795d2c |
delete mode 100644 data/61-gdm.rules
|
|
|
795d2c |
create mode 100644 data/61-gdm.rules.in
|
|
|
795d2c |
|
|
|
795d2c |
diff --git a/data/61-gdm.rules b/data/61-gdm.rules
|
|
|
795d2c |
deleted file mode 100644
|
|
|
795d2c |
index 5ffa8b8a0..000000000
|
|
|
795d2c |
--- a/data/61-gdm.rules
|
|
|
795d2c |
+++ /dev/null
|
|
|
795d2c |
@@ -1,2 +0,0 @@
|
|
|
795d2c |
-# disable Wayland on Cirrus chipsets
|
|
|
795d2c |
-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'"
|
|
|
795d2c |
diff --git a/data/61-gdm.rules.in b/data/61-gdm.rules.in
|
|
|
795d2c |
new file mode 100644
|
|
|
795d2c |
index 000000000..de8e17903
|
|
|
795d2c |
--- /dev/null
|
|
|
795d2c |
+++ b/data/61-gdm.rules.in
|
|
|
795d2c |
@@ -0,0 +1,2 @@
|
|
|
795d2c |
+# disable Wayland on Cirrus chipsets
|
|
|
795d2c |
+ATTR{vendor}=="0x1013", ATTR{device}=="0x00b8", ATTR{subsystem_vendor}=="0x1af4", ATTR{subsystem_device}=="0x1100", RUN+="@libexecdir@/gdm-disable-wayland"
|
|
|
795d2c |
diff --git a/data/Makefile.am b/data/Makefile.am
|
|
|
795d2c |
index a47e7900f..192dfa052 100644
|
|
|
795d2c |
--- a/data/Makefile.am
|
|
|
795d2c |
+++ b/data/Makefile.am
|
|
|
795d2c |
@@ -134,60 +134,65 @@ pam_lfs_files = \
|
|
|
795d2c |
EXTRA_DIST += $(pam_lfs_files)
|
|
|
795d2c |
|
|
|
795d2c |
pam_arch_files = pam-arch/gdm-autologin.pam \
|
|
|
795d2c |
pam-arch/gdm-launch-environment.pam \
|
|
|
795d2c |
pam-arch/gdm-fingerprint.pam \
|
|
|
795d2c |
pam-arch/gdm-smartcard.pam \
|
|
|
795d2c |
pam-arch/gdm-password.pam \
|
|
|
795d2c |
pam-arch/gdm-pin.pam \
|
|
|
795d2c |
$(NULL)
|
|
|
795d2c |
EXTRA_DIST += $(pam_arch_files)
|
|
|
795d2c |
|
|
|
795d2c |
if ENABLE_REDHAT_PAM_CONFIG
|
|
|
795d2c |
pam_files = $(pam_redhat_files)
|
|
|
795d2c |
endif
|
|
|
795d2c |
if ENABLE_OPENEMBEDDED_PAM_CONFIG
|
|
|
795d2c |
pam_files = $(pam_openembedded_files)
|
|
|
795d2c |
endif
|
|
|
795d2c |
if ENABLE_EXHERBO_PAM_CONFIG
|
|
|
795d2c |
pam_files = $(pam_exherbo_files)
|
|
|
795d2c |
endif
|
|
|
795d2c |
if ENABLE_LFS_PAM_CONFIG
|
|
|
795d2c |
pam_files = $(pam_lfs_files)
|
|
|
795d2c |
endif
|
|
|
795d2c |
if ENABLE_ARCH_PAM_CONFIG
|
|
|
795d2c |
pam_files = $(pam_arch_files)
|
|
|
795d2c |
endif
|
|
|
795d2c |
|
|
|
795d2c |
udevrulesdir = $(prefix)/lib/udev/rules.d
|
|
|
795d2c |
udevrules_DATA = 61-gdm.rules
|
|
|
795d2c |
|
|
|
795d2c |
+EXTRA_DIST += $(srcdir)/61-gdm.rules.in
|
|
|
795d2c |
+61-gdm.rules: $(srcdir)/61-gdm.rules.in
|
|
|
795d2c |
+ sed -e 's,[@]libexecdir[@],$(libexecdir),g' \
|
|
|
795d2c |
+ < $< > $@.tmp && mv $@.tmp $@
|
|
|
795d2c |
+
|
|
|
795d2c |
EXTRA_DIST += \
|
|
|
795d2c |
$(dconf_db_files) \
|
|
|
795d2c |
$(schemas_in_files) \
|
|
|
795d2c |
$(schemas_DATA) \
|
|
|
795d2c |
$(dbusconf_in_files) \
|
|
|
795d2c |
$(localealias_DATA) \
|
|
|
795d2c |
$(udevrules_DATA) \
|
|
|
795d2c |
gdm.schemas.in.in \
|
|
|
795d2c |
gdm.conf-custom.in \
|
|
|
795d2c |
Xsession.in \
|
|
|
795d2c |
Init.in \
|
|
|
795d2c |
PreSession.in \
|
|
|
795d2c |
PostSession.in \
|
|
|
795d2c |
PostLogin \
|
|
|
795d2c |
org.gnome.login-screen.gschema.xml.in \
|
|
|
795d2c |
$(NULL)
|
|
|
795d2c |
|
|
|
795d2c |
CLEANFILES = \
|
|
|
795d2c |
Xsession \
|
|
|
795d2c |
gdm.conf-custom \
|
|
|
795d2c |
Init \
|
|
|
795d2c |
PreSession \
|
|
|
795d2c |
PostSession \
|
|
|
795d2c |
$(gsettings_SCHEMAS) \
|
|
|
795d2c |
greeter-dconf-defaults \
|
|
|
795d2c |
$(NULL)
|
|
|
795d2c |
|
|
|
795d2c |
DISTCLEANFILES = \
|
|
|
795d2c |
$(dbusconf_DATA) \
|
|
|
795d2c |
gdm.schemas \
|
|
|
795d2c |
--
|
|
|
795d2c |
2.17.1
|
|
|
795d2c |
|