rpm/gdm
SHA256
1
0
Fork 0
forked from pool/gdm
Code Pull Requests Activity

Accepting request 811417 from GNOME:Factory

Browse Source 
- Update gdm-add-runtime-option-to-disable-starting-X-server-as-u.patch:
  When user session reuses tty7 same as greeter session, gdm
  doesn't bring up the greeter session after switching from other
  tty to tty7 (bsc#1171290). (forwarded request 810058 from xiaoguang_wang)

OBS-URL: https://build.opensuse.org/request/show/811417
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gdm?expand=0&rev=229
This commit is contained in:
Dominique Leuenberger 2020-06-08 21:47:32 +00:00 committed by Git OBS Bridge
commit 849126e63f
2 changed files with 27 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
gdm-add-runtime-option-to-disable-starting-X-server-as-u.patch
View File

@ -9,10 +9,10 @@ X server will be started under root. The same way as if gdm was built with
This allows system to run X server under root if and only-if necessary. This allows system to run X server under root if and only-if necessary.
--- ---
Index: gdm-3.36.2/daemon/gdm-local-display-factory.c Index: gdm-3.34.1/daemon/gdm-local-display-factory.c
=================================================================== ===================================================================
--- gdm-3.36.2.orig/daemon/gdm-local-display-factory.c --- gdm-3.34.1.orig/daemon/gdm-local-display-factory.c
+++ gdm-3.36.2/daemon/gdm-local-display-factory.c +++ gdm-3.34.1/daemon/gdm-local-display-factory.c
@@ -231,11 +231,12 @@ gdm_local_display_factory_create_transie @@ -231,11 +231,12 @@ gdm_local_display_factory_create_transie
g_debug ("GdmLocalDisplayFactory: Creating transient display"); g_debug ("GdmLocalDisplayFactory: Creating transient display");
@ -48,10 +48,21 @@ Index: gdm-3.36.2/daemon/gdm-local-display-factory.c
display = gdm_local_display_new (); display = gdm_local_display_new ();
if (session_type != NULL) { if (session_type != NULL) {
g_object_set (G_OBJECT (display), "session-type", session_type, NULL); g_object_set (G_OBJECT (display), "session-type", session_type, NULL);
Index: gdm-3.36.2/daemon/gdm-session.c @@ -772,6 +772,10 @@ on_vt_changed (GIOChannel *source,
g_debug ("GdmLocalDisplayFactory: VT changed from %u to %u",
previous_vt, factory->active_vt);
+ if (getenv ("GDM_DISABLE_USER_DISPLAY_SERVER") != NULL) {
+ return G_SOURCE_CONTINUE;
+ }
+
store = gdm_display_factory_get_display_store (GDM_DISPLAY_FACTORY (factory));
/* if the old VT was running a wayland login screen kill it
Index: gdm-3.34.1/daemon/gdm-session.c
=================================================================== ===================================================================
--- gdm-3.36.2.orig/daemon/gdm-session.c --- gdm-3.34.1.orig/daemon/gdm-session.c
+++ gdm-3.36.2/daemon/gdm-session.c +++ gdm-3.34.1/daemon/gdm-session.c
@@ -373,7 +373,11 @@ get_system_session_dirs (GdmSession *sel @@ -373,7 +373,11 @@ get_system_session_dirs (GdmSession *sel
#ifdef ENABLE_WAYLAND_SUPPORT #ifdef ENABLE_WAYLAND_SUPPORT
if (!self->ignore_wayland) { if (!self->ignore_wayland) {
@ -65,7 +76,7 @@ Index: gdm-3.36.2/daemon/gdm-session.c
for (i = 0; system_data_dirs[i]; i++) { for (i = 0; system_data_dirs[i]; i++) {
gchar *dir = g_build_filename (system_data_dirs[i], "wayland-sessions", NULL); gchar *dir = g_build_filename (system_data_dirs[i], "wayland-sessions", NULL);
@@ -3325,8 +3329,10 @@ gdm_session_get_display_mode (GdmSession @@ -3315,8 +3319,10 @@ gdm_session_get_display_mode (GdmSession
* right now. It will die with an error if logind devices * right now. It will die with an error if logind devices
* are paused when handed out. * are paused when handed out.
*/ */
@ -78,7 +89,7 @@ Index: gdm-3.36.2/daemon/gdm-session.c
#ifdef ENABLE_WAYLAND_SUPPORT #ifdef ENABLE_WAYLAND_SUPPORT
/* Wayland sessions are for now assumed to run in a /* Wayland sessions are for now assumed to run in a
@@ -3337,7 +3343,6 @@ gdm_session_get_display_mode (GdmSession @@ -3327,7 +3333,6 @@ gdm_session_get_display_mode (GdmSession
} }
#endif #endif
return GDM_SESSION_DISPLAY_MODE_REUSE_VT; return GDM_SESSION_DISPLAY_MODE_REUSE_VT;

8
gdm.changes
View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue May 26 00:36:52 UTC 2020 - Xiaoguang Wang <xiaoguang.wang@suse.com>
- Update gdm-add-runtime-option-to-disable-starting-X-server-as-u.patch:
When user session reuses tty7 same as greeter session, gdm
doesn't bring up the greeter session after switching from other
tty to tty7 (bsc#1171290).
------------------------------------------------------------------- -------------------------------------------------------------------
Mon May 4 20:34:09 UTC 2020 - Bjørn Lie <bjorn.lie@gmail.com> Mon May 4 20:34:09 UTC 2020 - Bjørn Lie <bjorn.lie@gmail.com>