Workaround faulty setting from Ubuntu user-setup package

diff --git a/debian/patches/autologin-session-workaround.patch b/debian/patches/autologin-session-workaround.patch
new file mode 100644 (file)
index 0000000..1d977d7
--- /dev/null
+++ b/debian/patches/autologin-session-workaround.patch
@@ -0,0 +1,22 @@
+Description: Workaround faulty setting from Ubuntu user-setup package
+Author: Robert Ancell <robert.ancell@canonical.com>
+Bug: https://bugs.launchpad.net/bugs/1484083
+
+Index: trunk/src/seat.c
+===================================================================
+--- trunk.orig/src/seat.c
++++ trunk/src/seat.c
+@@ -1033,7 +1033,12 @@ create_user_session (Seat *seat, const g
+     if (autostart)
+     {
+         const gchar *autologin_session_name = seat_get_string_property (seat, "autologin-session");
+-        if (autologin_session_name)
++        /* Workaround faulty setting from Ubuntu user-setup package
++         * See https://bugs.launchpad.net/bugs/1484083
++         */
++        if (autologin_session_name && strcmp (autologin_session_name, "lightdm-autologin") == 0)
++            l_debug (seat, "Ignoring invalid autologin-session option (LP: #1484083)");
++        else if (autologin_session_name)
+             session_name = autologin_session_name;
+     }
+ 

diff --git a/debian/patches/series b/debian/patches/series
index 8d18b21aaf07f92f56235da612af014887e9ba53..d3ba2550a2c08550df7ba0b12a73746f218837a5 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 04_language_handling.patch
 05_translate_debian_files.patch
+autologin-session-workaround.patch