SHA256
1
0
forked from pool/gdm

Accepting request 1154474 from home:xiaoguang_wang:branches:GNOME:Factory

- Update gdm-xvnc-start-session-failed.patch: Following the upstream
  final solution(bsc#1219205 glgo#GNOME/gdm#909).

OBS-URL: https://build.opensuse.org/request/show/1154474
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=543
This commit is contained in:
Dominique Leuenberger 2024-03-04 09:12:29 +00:00 committed by Git OBS Bridge
parent f09942746b
commit aaeb66c727
2 changed files with 31 additions and 8 deletions

View File

@ -1,16 +1,33 @@
From f984069418485191fb8fee16c9f202ac2b717e41 Mon Sep 17 00:00:00 2001
From: Joan Torres <joan.torres@suse.com>
Date: Fri, 1 Mar 2024 12:07:38 +0100
Subject: [PATCH] session: Reuse the VT when on XDMCP
XDMCP is running when session_type is not wayland and is not on any
seat_id.
Consider this to keep using DISPLAY_MODE_REUSE_VT on XDMCP (keep using the
same Xorg/Xvnc server), otherwise, the vncserver would be closed.
---
daemon/gdm-session.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/daemon/gdm-session.c b/daemon/gdm-session.c
index d6c39c2..52d9718 100644
index 09b6ce52e..a4c4b2dcf 100644
--- a/daemon/gdm-session.c
+++ b/daemon/gdm-session.c
@@ -3431,8 +3431,9 @@ gdm_session_get_display_mode (GdmSession *self)
@@ -3648,6 +3648,11 @@ gdm_session_get_display_mode (GdmSession *self)
self->is_program_session? "yes" : "no",
self->display_seat_id);
- if (g_strcmp0 (self->display_seat_id, "seat0") != 0) {
- return GDM_SESSION_DISPLAY_MODE_LOGIND_MANAGED;
+ if (g_strcmp0 (self->display_seat_id?: "", "") == 0
+ && g_strcmp0 (self->session_type?: "", "") == 0) {
+ if (self->display_seat_id == NULL &&
+ g_strcmp0 (self->session_type, "wayland") != 0) {
+ return GDM_SESSION_DISPLAY_MODE_REUSE_VT;
+ }
+
if (g_strcmp0 (self->display_seat_id, "seat0") != 0) {
return GDM_SESSION_DISPLAY_MODE_LOGIND_MANAGED;
}
--
GitLab
#ifdef ENABLE_USER_DISPLAY_SERVER

View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Mon Mar 4 01:24:06 UTC 2024 - Xiaoguang Wang <xiaoguang.wang@suse.com>
- Update gdm-xvnc-start-session-failed.patch: Following the upstream
final solution(bsc#1219205 glgo#GNOME/gdm#909).
-------------------------------------------------------------------
Thu Feb 22 01:17:18 UTC 2024 - Xiaoguang Wang <xiaoguang.wang@suse.com>