import gdm-40.0-2.el8

This commit is contained in:
CentOS Sources 2021-05-21 10:11:54 +00:00 committed by Andrew Lukoshko
parent e9fcf61042
commit 207d2a80c3
2 changed files with 10 additions and 6 deletions

View File

@ -40,6 +40,11 @@ index 8a4ef06cd..8554a0442 100644
if (factory->num_failures > 0 || !gdm_local_display_factory_use_wayland ()) { if (factory->num_failures > 0 || !gdm_local_display_factory_use_wayland ()) {
session_type = NULL; session_type = NULL;
g_debug ("GdmLocalDisplayFactory: New displays on seat0 will use X11 fallback"); g_debug ("GdmLocalDisplayFactory: New displays on seat0 will use X11 fallback");
+
+ /* workaround logind race for now
+ * bug 1643874
+ */
+ g_usleep (2 * G_USEC_PER_SEC);
} else { } else {
g_debug ("GdmLocalDisplayFactory: New displays on seat0 will use wayland"); g_debug ("GdmLocalDisplayFactory: New displays on seat0 will use wayland");
} }
@ -50,11 +55,6 @@ index 8a4ef06cd..8554a0442 100644
/* Force legacy X11 for all auxiliary seats */ /* Force legacy X11 for all auxiliary seats */
seat_supports_graphics = TRUE; seat_supports_graphics = TRUE;
session_type = NULL; session_type = NULL;
+
+ /* workaround logind race for now
+ * bug 1643874
+ */
+ g_usleep (2 * G_USEC_PER_SEC);
} }
/* For seat0, we have a fallback logic to still try starting it after /* For seat0, we have a fallback logic to still try starting it after

View File

@ -12,7 +12,7 @@
Name: gdm Name: gdm
Epoch: 1 Epoch: 1
Version: 40.0 Version: 40.0
Release: 1%{?dist} Release: 2%{?dist}
Summary: The GNOME Display Manager Summary: The GNOME Display Manager
License: GPLv2+ License: GPLv2+
@ -354,6 +354,10 @@ fi
%{_libdir}/pkgconfig/gdm-pam-extensions.pc %{_libdir}/pkgconfig/gdm-pam-extensions.pc
%changelog %changelog
* Wed May 19 2021 Ray Strode <rstrode@redhat.com> - 40.0-2
- Fix workaround for systemd bug that's breaking X11 fallback
Resolves: #1962049
* Wed May 05 2021 Ray Strode <rstrode@redhat.com> - 40.0-1 * Wed May 05 2021 Ray Strode <rstrode@redhat.com> - 40.0-1
- Rebase to 40.0 - Rebase to 40.0
Resolves: #1909300 Resolves: #1909300