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

Accepting request 1059266 from home:yfjiang:branches:GNOME:Factory

Browse Source 
- Update gdm-disable-gnome-initial-setup.patch: Refactoring to
  disable it on SLE runtime, so with the same executable it is
  still possible to run on Leap (jsc#PED-1719).

OBS-URL: https://build.opensuse.org/request/show/1059266
OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=513
This commit is contained in:
Dominique Leuenberger 2023-01-23 18:32:33 +00:00 committed by Git OBS Bridge
parent 9621ba63be
commit 1b2a835a8a
2 changed files with 32 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
gdm-disable-gnome-initial-setup.patch
View File

@ -1,42 +1,31 @@
Index: gdm-41.0/daemon/gdm-display.c Index: gdm-41.3/daemon/gdm-display.c
=================================================================== ===================================================================
--- gdm-41.0.orig/daemon/gdm-display.c --- gdm-41.3.orig/daemon/gdm-display.c
+++ gdm-41.0/daemon/gdm-display.c +++ gdm-41.3/daemon/gdm-display.c
@@ -573,7 +573,7 @@ gdm_display_prepare (GdmDisplay *self) @@ -1655,6 +1655,9 @@ wants_initial_setup (GdmDisplay *self)
exit (EXIT_FAILURE); gboolean enabled = FALSE;
gboolean forced = FALSE;
+ g_autofree gchar *release_name = NULL;
+ release_name = g_get_os_info (G_OS_INFO_KEY_NAME);
+
priv = gdm_display_get_instance_private (self);
if (already_done_initial_setup ()) {
@@ -1691,6 +1694,16 @@ wants_initial_setup (GdmDisplay *self)
return FALSE;
} }
- priv->doing_initial_setup = wants_initial_setup (self); + if (release_name == NULL) {
+ priv->doing_initial_setup = FALSE; + g_error ("GdmDisplay: Failed to parse os-release");
+ return enabled;
g_object_ref (self); + }
ret = GDM_DISPLAY_GET_CLASS (self)->prepare (self); +
@@ -1542,6 +1542,7 @@ on_launch_environment_session_died (GdmL + if (g_str_has_prefix (release_name, "SLE")) {
self_destruct (self); + g_debug ("GdmDisplay: Disable gnome-initial-setup on SLE");
} + return FALSE;
+ }
+#if 0 +
static gboolean
can_create_environment (const char *session_id)
{
@@ -1693,6 +1694,7 @@ wants_initial_setup (GdmDisplay *self)
return enabled; return enabled;
} }
+#endif
void
gdm_display_start_greeter_session (GdmDisplay *self)
Index: gdm-41.0/data/gdm.schemas.in
===================================================================
--- gdm-41.0.orig/data/gdm.schemas.in
+++ gdm-41.0/data/gdm.schemas.in
@@ -50,7 +50,7 @@
<schema>
<key>daemon/InitialSetupEnable</key>
<signature>b</signature>
- <default>true</default>
+ <default>false</default>
</schema>
<schema>
<key>daemon/PreferredDisplayServer</key>

7
gdm.changes
View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Jan 18 01:35:21 UTC 2023 - Yifan Jiang <yfjiang@suse.com>
- Update gdm-disable-gnome-initial-setup.patch: Refactoring to
disable it on SLE runtime, so with the same executable it is
still possible to run on Leap (jsc#PED-1719).
------------------------------------------------------------------- -------------------------------------------------------------------
Wed Jan 4 08:59:29 UTC 2023 - Alynx Zhou <alynx.zhou@suse.com> Wed Jan 4 08:59:29 UTC 2023 - Alynx Zhou <alynx.zhou@suse.com>