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

- Update gdm-add-runtime-option-to-disable-starting-X-server-as-u.patch:
  With GDM_DISABLE_USER_DISPLAY_SERVER=1 environment variable, make
  X server logging to /var/log/Xorg.*.log and journal log
  (bsc#1192177).

OBS-URL: https://build.opensuse.org/request/show/933391
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=488
This commit is contained in:
Bjørn Lie 2021-12-07 10:17:20 +00:00 committed by Git OBS Bridge
parent ad1a15a669
commit 4ddb74abc4
2 changed files with 23 additions and 3 deletions

View File

@ -104,7 +104,7 @@ Index: gdm-41.0/daemon/gdm-session.c
===================================================================
--- gdm-41.0.orig/daemon/gdm-session.c
+++ gdm-41.0/daemon/gdm-session.c
@@ -3360,6 +3360,7 @@ gdm_session_get_display_mode (GdmSession
@@ -3362,6 +3362,7 @@ gdm_session_get_display_mode (GdmSession
}
#ifdef ENABLE_USER_DISPLAY_SERVER
@ -112,7 +112,7 @@ Index: gdm-41.0/daemon/gdm-session.c
/* All other cases (wayland login screen, X login screen,
* wayland user session, X user session) use the NEW_VT
* display mode. That display mode means that GDM allocates
@@ -3382,7 +3383,8 @@ gdm_session_get_display_mode (GdmSession
@@ -3384,7 +3385,8 @@ gdm_session_get_display_mode (GdmSession
* are paused when handed out.
*/
return GDM_SESSION_DISPLAY_MODE_NEW_VT;
@ -122,7 +122,7 @@ Index: gdm-41.0/daemon/gdm-session.c
#ifdef ENABLE_WAYLAND_SUPPORT
/* Wayland sessions are for now assumed to run in a
@@ -3393,6 +3395,7 @@ gdm_session_get_display_mode (GdmSession
@@ -3395,6 +3397,7 @@ gdm_session_get_display_mode (GdmSession
}
#endif
return GDM_SESSION_DISPLAY_MODE_REUSE_VT;
@ -162,6 +162,18 @@ Index: gdm-41.0/daemon/gdm-server.c
===================================================================
--- gdm-41.0.orig/daemon/gdm-server.c
+++ gdm-41.0/daemon/gdm-server.c
@@ -238,9 +238,9 @@ gdm_server_init_command (GdmServer *serv
/* For systemd, we don't have a log file but instead log to stdout,
so set it to the xserver's built-in default verbosity */
if (debug)
- verbosity = "7 -logfile /dev/null";
+ verbosity = "7";
else
- verbosity = "3 -logfile /dev/null";
+ verbosity = "3";
#endif
if (g_access (SYSTEMD_X_SERVER, X_OK) < 0) {
@@ -752,7 +752,7 @@ gdm_server_start (GdmServer *server)
GError **error = &local_error;

View File

@ -1,3 +1,11 @@
-------------------------------------------------------------------
Tue Nov 23 01:55:56 UTC 2021 - Xiaoguang Wang <xiaoguang.wang@suse.com>
- Update gdm-add-runtime-option-to-disable-starting-X-server-as-u.patch:
With GDM_DISABLE_USER_DISPLAY_SERVER=1 environment variable, make
X server logging to /var/log/Xorg.*.log and journal log
(bsc#1192177).
-------------------------------------------------------------------
Tue Oct 19 09:21:15 UTC 2021 - Martin Wilck <mwilck@suse.com>