summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIain Lane <iain.lane@canonical.com>2017-07-17 13:13:52 +0100
committerIain Lane <iain.lane@canonical.com>2017-07-17 13:13:52 +0100
commitd521f9728278561634180ff63a62300c036b6093 (patch)
treeaa02af88da1d7ca4920907f778d9479402b6d63e
parentd75cfe4d53f01ab22493854cc47e68c22733c945 (diff)
downloadlightdm-git-d521f9728278561634180ff63a62300c036b6093.tar.gz
debian/lightdm.config: When upgrading to this version, don't show the DM
selection prompt. We're trying to suppress the prompt and switch Ubuntu desktop users to gdm3 smoothly, but lightdm's prompt is showing up as gdm3 is on the system when lightdm.config is executed. This means that if there is a situation when upgraders to this version *should* be shown the prompt, they won't be. If that is the case, we'll need to think again about how to implement this.
-rw-r--r--debian/changelog12
-rw-r--r--debian/lightdm.config6
2 files changed, 16 insertions, 2 deletions
diff --git a/debian/changelog b/debian/changelog
index ebd26269..4155171c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+lightdm (1.22.0-0ubuntu6) UNRELEASED; urgency=medium
+
+ * debian/lightdm.config: When upgrading to this version, don't show the DM
+ selection prompt. We're trying to suppress the prompt and switch Ubuntu
+ desktop users to gdm3 smoothly, but lightdm's prompt is showing up as gdm3
+ is on the system when lightdm.config is executed. This means that if there
+ is a situation when upgraders to this version *should* be shown the
+ prompt, they won't be. If that is the case, we'll need to think again
+ about how to implement this.
+
+ -- Iain Lane <iain.lane@canonical.com> Fri, 14 Jul 2017 13:01:42 +0100
+
lightdm (1.22.0-0ubuntu5) artful; urgency=medium
* Change back the default session to 'ubuntu', as it now corresponds to
diff --git a/debian/lightdm.config b/debian/lightdm.config
index 9c6d8612..20b433c7 100644
--- a/debian/lightdm.config
+++ b/debian/lightdm.config
@@ -46,10 +46,12 @@ fi
# when installing from scratch as part of a release upgrade, default to
# lightdm, otherwise ask
+
+# GDM transition: When upgrading from an old version, don't ask the question.
if [ -z "$2" -a -n "$RELEASE_UPGRADE_IN_PROGRESS" ]; then
db_set shared/default-x-display-manager lightdm
- db_fset shared/default-x-display-manager seen true
-else
+ ab_fset shared/default-x-display-manager seen true
+elif ! dpkg --compare-versions "$2" lt-nl "1.22.0-0ubuntu6"; then
db_input high shared/default-x-display-manager || :
db_go || :
fi