Dominique Leuenberger
094f083764
- Rebase patches for SLE-15-SP6 (bsc#216595): + Rebase gdm-add-runtime-option-to-disable-starting-X-server-as-u.patch + Rebase gdm-disable-gnome-initial-setup.patch + Rebase gdm-restart-session-when-X-server-restart.patch OBS-URL: https://build.opensuse.org/request/show/1121774 OBS-URL: https://build.opensuse.org/package/show/GNOME:Factory/gdm?expand=0&rev=531
32 lines
960 B
Diff
32 lines
960 B
Diff
Index: gdm-45.0.1/daemon/gdm-display.c
|
|
===================================================================
|
|
--- gdm-45.0.1.orig/daemon/gdm-display.c
|
|
+++ gdm-45.0.1/daemon/gdm-display.c
|
|
@@ -1622,6 +1622,9 @@ wants_initial_setup (GdmDisplay *self)
|
|
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 ()) {
|
|
@@ -1658,6 +1661,16 @@ wants_initial_setup (GdmDisplay *self)
|
|
return FALSE;
|
|
}
|
|
|
|
+ if (release_name == NULL) {
|
|
+ g_error ("GdmDisplay: Failed to parse os-release");
|
|
+ return enabled;
|
|
+ }
|
|
+
|
|
+ if (g_str_has_prefix (release_name, "SLE")) {
|
|
+ g_debug ("GdmDisplay: Disable gnome-initial-setup on SLE");
|
|
+ return FALSE;
|
|
+ }
|
|
+
|
|
return enabled;
|
|
}
|
|
|