Adding 41-force-reset.patch to enforce reset (Closes: #842333).
authorAndriy Grytsenko <andrej@rep.kiev.ua>
Fri, 11 Nov 2016 20:38:22 +0000 (22:38 +0200)
committerAndriy Grytsenko <andrej@rep.kiev.ua>
Fri, 11 Nov 2016 20:38:22 +0000 (22:38 +0200)
debian/patches/41-force-reset.patch [new file with mode: 0644]
debian/patches/series

diff --git a/debian/patches/41-force-reset.patch b/debian/patches/41-force-reset.patch
new file mode 100644 (file)
index 0000000..209e0a4
--- /dev/null
@@ -0,0 +1,31 @@
+Description: Enforce reset X server after logout.
+Author: Andriy Grytsenko <andrej@rep.kiev.ua>
+Bug: https://sourceforge.net/p/lxde/bugs/835/
+
+--- a/src/lxdm.c
++++ b/src/lxdm.c
+@@ -1088,11 +1088,13 @@
+       gchar *argv[] = { "/etc/lxdm/PostLogout", NULL };
+       g_spawn_async(NULL, argv, s->env, G_SPAWN_SEARCH_PATH, NULL, NULL, NULL, NULL);
++#if 0 /* ignore setting and always reset, see Debian bug #842333 */
+       if(g_key_file_get_integer(config,"server","reset",NULL)!=1)
+       {
+               lxsession_stop(s);
+       }
+       else
++#endif
+       {
+               lxsession_free(s);
+               s=NULL;
+--- a/data/lxdm.conf.in
++++ b/data/lxdm.conf.in
+@@ -26,8 +26,6 @@
+ # arg=/usr/bin/X -background vt1
+ # uncomment this if you really want xserver listen to tcp
+ # tcp_listen=1
+-# uncoment this if you want reset the xserver after logou
+-# reset=1
+ [display]
+ ## gtk theme used by greeter
index 249beaf..94b5798 100644 (file)
@@ -1,3 +1,4 @@
 15-path-replace.patch
 22_ubuntu_i18n_oneiric.patch
 23_debian-config.patch
+41-force-reset.patch