File gdm-quit-plymouth-when-xdmcp-is-the-only-allowe... of Package gdm.9764

Overview Repositories Revisions Requests Users Attributes Meta

File gdm-quit-plymouth-when-xdmcp-is-the-only-allowed-connection.patch of Package gdm.9764

From f4cb5646841392117a16f5ccc3066d6ace152cfc Mon Sep 17 00:00:00 2001
From: Yifan J <yfjiang@suse.com>
Date: Tue, 10 Apr 2018 14:17:30 +0800
Subject: [PATCH] daemon/gdm-manager.c: quit plymouth when xdmcp is the only
 allowed connection.

gdm is responsible to kill plymouth by spawning the "plymouth quit"
subprocesses in gdm-manager.c. The current code pathes of quiting
plymouth can never be reached when xdmcp is the only connection
allowed. Consequently in the case of

!show_local_greeter && xdmcp_enabled

the plymouth-quit-wait.service will never quit and the login prompt
will not popup without manual interference. This issue could be
more obviously observed when a downstream like openSUSE which
allows a customized sysconfig to switch the corresponding two
options on a headless server (s390), where the setup is usually:

DISPLAYMANAGER_REMOTE_ACCESS="yes"
    DISPLAYMANAGER_STARTS_XSERVER="no"

The proposed patch handles this edge case by quit plymouth immediately
when the condition is detected.

https://bugzilla.gnome.org/show_bug.cgi?id=795120
---
 daemon/gdm-manager.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/daemon/gdm-manager.c b/daemon/gdm-manager.c
index 69bae91b..7539acf1 100644
--- a/daemon/gdm-manager.c
+++ b/daemon/gdm-manager.c
@@ -2510,6 +2510,13 @@ gdm_manager_start (GdmManager *manager)
 #ifdef HAVE_LIBXDMCP
         /* Accept remote connections */
         if (manager->priv->xdmcp_enabled) {
+#ifdef WITH_PLYMOUTH
+                /* Quit plymouth if xdmcp is the only display */
+                if (!manager->priv->show_local_greeter && manager->priv->plymouth_is_running) {
+                        plymouth_quit_with_transition ();
+                        manager->priv->plymouth_is_running = FALSE;
+                }
+#endif
                 if (manager->priv->xdmcp_factory != NULL) {
                         g_debug ("GdmManager: Accepting XDMCP connections...");
                         gdm_display_factory_start (GDM_DISPLAY_FACTORY (manager->priv->xdmcp_factory));
-- 
2.16.1

Places

File gdm-quit-plymouth-when-xdmcp-is-the-only-allowed-connection.patch of Package gdm.9764

Places