Accepting request 939440 from GNOME:Factory

OBS-URL: https://build.opensuse.org/request/show/939440
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/gdm?expand=0&rev=238

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;
  

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;
+ 

gdm.changes

@@ -1,3 +1,19 @@
+-------------------------------------------------------------------
+Wed Dec  8 03:36:08 UTC 2021 - Xiaoguang Wang <xiaoguang.wang@suse.com>
+
+- 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 <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>
 

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}