From 4ddb74abc4c2e79a2b646ed92614f991786e8e9909e320f8a7d7bdf36db05539 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Tue, 7 Dec 2021 10:17:20 +0000 Subject: [PATCH 1/2] 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 --- ...ion-to-disable-starting-X-server-as-u.patch | 18 +++++++++++++++--- gdm.changes | 8 ++++++++ 2 files changed, 23 insertions(+), 3 deletions(-) diff --git a/gdm-add-runtime-option-to-disable-starting-X-server-as-u.patch b/gdm-add-runtime-option-to-disable-starting-X-server-as-u.patch index 927a75d..566752e 100644 --- a/gdm-add-runtime-option-to-disable-starting-X-server-as-u.patch +++ b/gdm-add-runtime-option-to-disable-starting-X-server-as-u.patch @@ -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; diff --git a/gdm.changes b/gdm.changes index 389de15..bc0b0b4 100644 --- a/gdm.changes +++ b/gdm.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Tue Nov 23 01:55:56 UTC 2021 - Xiaoguang Wang + +- 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 From f190431d845e1380c16528b285e9facae8ff627dd6e0ad337c6cefb857c9040b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Bj=C3=B8rn=20Lie?= Date: Fri, 10 Dec 2021 18:52:43 +0000 Subject: [PATCH 2/2] Accepting request 936402 from home:xiaoguang_wang:branches:GNOME:Factory - Add gdm-restart-greeter-session-after-crash.patch: When active vt is gdm initial vt, restart greeter session. Avoiding the blank screen when greeter session crashed (bsc#1190230 glgo#GNOME/gdm#735). OBS-URL: https://build.opensuse.org/request/show/936402 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=489 --- gdm-restart-greeter-session-after-crash.patch | 17 +++++++++++++++++ gdm.changes | 8 ++++++++ gdm.spec | 3 +++ 3 files changed, 28 insertions(+) create mode 100644 gdm-restart-greeter-session-after-crash.patch diff --git a/gdm-restart-greeter-session-after-crash.patch b/gdm-restart-greeter-session-after-crash.patch new file mode 100644 index 0000000..f908068 --- /dev/null +++ b/gdm-restart-greeter-session-after-crash.patch @@ -0,0 +1,17 @@ +Index: gdm-3.34.1/daemon/gdm-local-display-factory.c +=================================================================== +--- gdm-3.34.1.orig/daemon/gdm-local-display-factory.c ++++ gdm-3.34.1/daemon/gdm-local-display-factory.c +@@ -366,7 +366,11 @@ on_display_status_changed (GdmDisplay + * ensures we get a new login screen when the user logs out, + * if there isn't one. + */ +- if (is_local && g_strcmp0 (session_class, "greeter") != 0) { ++ g_debug ("GdmLocalDisplayFactory: session_class = %s active_vt = %u", session_class, factory->active_vt); ++ if (is_local && ++ (g_strcmp0 (session_class, "greeter") != 0 || ++ factory->active_vt == GDM_INITIAL_VT || ++ factory->active_vt == 0)) { + /* reset num failures */ + factory->num_failures = 0; + diff --git a/gdm.changes b/gdm.changes index bc0b0b4..e92e5a6 100644 --- a/gdm.changes +++ b/gdm.changes @@ -1,3 +1,11 @@ +------------------------------------------------------------------- +Wed Dec 8 03:36:08 UTC 2021 - Xiaoguang Wang + +- Add gdm-restart-greeter-session-after-crash.patch: When active vt + is gdm initial vt, restart greeter session. Avoiding the blank + screen when greeter session crashed + (bsc#1190230 glgo#GNOME/gdm#735). + ------------------------------------------------------------------- Tue Nov 23 01:55:56 UTC 2021 - Xiaoguang Wang diff --git a/gdm.spec b/gdm.spec index 5ae78b9..99ef452 100644 --- a/gdm.spec +++ b/gdm.spec @@ -65,6 +65,8 @@ Patch14: gdm-switch-user-tty7.patch Patch15: gdm-disable-wayland-on-mgag200-chipsets.patch # PATCH-FIX-UPSTREAM gdm-daemon-Infer-session-type-from-desktop-file.patch bsc#1191809 glgo#GNOME/gdm#159 rstrode@redhat.com -- daemon: Infer session type from desktop file if user has no saved session type Patch16: gdm-daemon-Infer-session-type-from-desktop-file.patch +# PATCH-FIX-UPSTREAM gdm-restart-greeter-session-after-crash.patch bsc#1190230 glgo#GNOME/gdm#735 xwang@suse.com -- Restart greeter session when crashed +Patch17: gdm-restart-greeter-session-after-crash.patch ### NOTE: Keep please SLE-only patches at bottom (starting on 1000). # PATCH-FIX-SLE gdm-disable-gnome-initial-setup.patch bnc#1067976 qzhao@suse.com -- Disable gnome-initial-setup runs before gdm, g-i-s will only serve for CJK people to choose the input-method after login. Patch1000: gdm-disable-gnome-initial-setup.patch @@ -223,6 +225,7 @@ running display manager. %patch14 -p1 %patch15 -p1 %patch16 -p1 +%patch17 -p1 # SLE and Leap only patches start at 1000 %if 0%{?sle_version}