diff --git a/gdm-fails-to-restart-gnome-shell.patch b/gdm-fails-to-restart-gnome-shell.patch new file mode 100644 index 0000000..9a716d3 --- /dev/null +++ b/gdm-fails-to-restart-gnome-shell.patch @@ -0,0 +1,13 @@ +diff --git a/daemon/gdm-display.c b/daemon/gdm-display.c +index ab84ba4..e1d0996 100644 +--- a/daemon/gdm-display.c ++++ b/daemon/gdm-display.c +@@ -673,7 +673,7 @@ gdm_display_unmanage (GdmDisplay *self) + } + + elapsed = g_timer_elapsed (self->priv->server_timer, NULL); +- if (elapsed < 3) { ++ if (elapsed < 10) { + g_warning ("GdmDisplay: display lasted %lf seconds", elapsed); + _gdm_display_set_status (self, GDM_DISPLAY_FAILED); + } else { diff --git a/gdm.changes b/gdm.changes index a7a9507..921a8db 100644 --- a/gdm.changes +++ b/gdm.changes @@ -1,3 +1,9 @@ +------------------------------------------------------------------- +Tue Aug 16 09:10:42 UTC 2016 - tyang@suse.com + +- Add gdm-fails-to-restart-gnome-shell.patch + bsc#981976 -- Gdm should stop after a few times fails + ------------------------------------------------------------------- Wed May 25 11:07:42 UTC 2016 - zaitor@opensuse.org diff --git a/gdm.spec b/gdm.spec index 8f3a55f..d18d487 100644 --- a/gdm.spec +++ b/gdm.spec @@ -1,7 +1,7 @@ # # spec file for package gdm # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2016 SUSE LINUX Products GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -60,6 +60,8 @@ Patch34: gdm-default-wm.patch Patch35: gdm-xauthlocalhostname.patch # PATCH-FIX-UPSTREAM gdm-plymouth-vt1.patch bnc#881676 fcrozat@suse.com -- switch to VT1 when quitting if gdm was starting with plymouth running Patch41: gdm-plymouth-vt1.patch +# PATCH-FIX-UPSTREAM gdm-fails-to-restart-gnome-shell.patch bsc#981976 tyang@suse.com -- Gdm should stop after a few times fails +Patch42: gdm-fails-to-restart-gnome-shell.patch BuildRequires: check-devel # needed for directory ownership BuildRequires: dconf @@ -190,6 +192,7 @@ translation-update-upstream %patch34 -p1 #patch35 -p1 %patch41 -p1 +%patch42 -p1 %build NOCONFIGURE=1 sh autogen.sh