summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRay Strode <rstrode@redhat.com>2022-02-15 14:33:22 -0500
committerRay Strode <rstrode@redhat.com>2022-03-07 10:29:23 -0500
commita9928bfcc9c6d81d60e047b7838d4107835b8f89 (patch)
treeb4b8f1f3223626c83ebaebad06137122cca71d18
parentd3e073fa1cd314b344db1ec22f0add2702a6c299 (diff)
downloadgdm-a9928bfcc9c6d81d60e047b7838d4107835b8f89.tar.gz
common: Reload settings when graphics initialize
If GDM starts faster than graphics initialize, then the udev rules that write out /run/gdm/custom.conf might get run too late for GDM to notice. This commit changes GDM to reread its config after graphicals initialization completes. https://gitlab.gnome.org/GNOME/gdm/-/issues/763
-rw-r--r--daemon/gdm-local-display-factory.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/daemon/gdm-local-display-factory.c b/daemon/gdm-local-display-factory.c
index 0b1d3482..8bca8ce9 100644
--- a/daemon/gdm-local-display-factory.c
+++ b/daemon/gdm-local-display-factory.c
@@ -1050,10 +1050,12 @@ on_seat_properties_changed (GDBusConnection *connection,
if (ret < 0)
return;
- if (ret != 0)
+ if (ret != 0) {
+ gdm_settings_direct_reload ();
ensure_display_for_seat (GDM_LOCAL_DISPLAY_FACTORY (user_data), seat);
- else
+ } else {
delete_display (GDM_LOCAL_DISPLAY_FACTORY (user_data), seat);
+ }
}
static gboolean
@@ -1287,6 +1289,7 @@ on_uevent (GUdevClient *client,
g_signal_handler_disconnect (factory->gudev_client, factory->uevent_handler_id);
factory->uevent_handler_id = 0;
+ gdm_settings_direct_reload ();
ensure_display_for_seat (factory, "seat0");
}
#endif