Fix erroneous jump back to login screen on udev events after login

Resolves: #2065901
This commit is contained in:
Ray Strode 2022-03-22 10:43:33 -04:00
parent 1054e3fbf5
commit f77aa281f0
2 changed files with 11 additions and 3 deletions

View File

@ -118,7 +118,7 @@ index c00e1c47..0b1d3482 100644
gboolean seat0_graphics_check_timed_out; gboolean seat0_graphics_check_timed_out;
guint seat0_graphics_check_timeout_id; guint seat0_graphics_check_timeout_id;
+ guint uevent_handler_id; + gulong uevent_handler_id;
+ +
#if defined(ENABLE_USER_DISPLAY_SERVER) #if defined(ENABLE_USER_DISPLAY_SERVER)
unsigned int active_vt; unsigned int active_vt;
@ -150,7 +150,7 @@ index c00e1c47..0b1d3482 100644
GdmDisplay *display, GdmDisplay *display,
gpointer user_data); gpointer user_data);
@@ -594,142 +606,232 @@ lookup_by_seat_id (const char *id, @@ -594,142 +606,236 @@ lookup_by_seat_id (const char *id,
gpointer user_data) gpointer user_data)
{ {
const char *looking_for = user_data; const char *looking_for = user_data;
@ -257,6 +257,10 @@ index c00e1c47..0b1d3482 100644
+ +
+ g_debug ("GdmLocalDisplayFactory: udev has %ssettled enough for graphics.", is_settled? "" : "not "); + g_debug ("GdmLocalDisplayFactory: udev has %ssettled enough for graphics.", is_settled? "" : "not ");
+ g_list_free_full (devices, g_object_unref); + g_list_free_full (devices, g_object_unref);
+
+ if (is_settled)
+ g_clear_signal_handler (&factory->uevent_handler_id, factory->gudev_client);
+
+ return is_settled; + return is_settled;
+} +}
+#endif +#endif

View File

@ -11,7 +11,7 @@
Name: gdm Name: gdm
Epoch: 1 Epoch: 1
Version: 40.1 Version: 40.1
Release: 13%{?dist} Release: 14%{?dist}
Summary: The GNOME Display Manager Summary: The GNOME Display Manager
License: GPLv2+ License: GPLv2+
@ -343,6 +343,10 @@ dconf update || :
%{_libdir}/pkgconfig/gdm-pam-extensions.pc %{_libdir}/pkgconfig/gdm-pam-extensions.pc
%changelog %changelog
* Tue Mar 22 2022 Ray Strode <rstrode@redhat.com> - 40.1-14
- Fix erroneous jump back to login screen on udev events after login
Resolves: #2065901
* Mon Mar 07 2022 Ray Strode <rstrode@redhat.com> - 40.1-13 * Mon Mar 07 2022 Ray Strode <rstrode@redhat.com> - 40.1-13
- Pull in latest udev rules and race fixes for handling - Pull in latest udev rules and race fixes for handling
udev rules. udev rules.