From: Martin Pitt <martin.pitt@canonical.com>
Date: Tue, 25 Oct 2016 19:23:18 +0000 (+0200)
Subject: debian/lightdm-greeter-session: Don't launch another session D-Bus if one
X-Git-Url: http://rtime.felk.cvut.cz/gitweb/sojka/lightdm.git/commitdiff_plain/19c90032b83e06844cb362ff82a67999e4200f74

debian/lightdm-greeter-session: Don't launch another session D-Bus if one
is already running (usually from dbus-user-session).
---

diff --git a/debian/changelog b/debian/changelog
index 0267b37a..95233835 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+lightdm (1.20.0-0ubuntu2) UNRELEASED; urgency=medium
+
+  * debian/lightdm-greeter-session: Don't launch another session D-Bus if one
+    is already running (usually from dbus-user-session).
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Tue, 25 Oct 2016 21:22:51 +0200
+
 lightdm (1.20.0-0ubuntu1) yakkety; urgency=medium
 
   * New upstream release:
diff --git a/debian/lightdm-greeter-session b/debian/lightdm-greeter-session
index 536e0ae2..838c0f2d 100644
--- a/debian/lightdm-greeter-session
+++ b/debian/lightdm-greeter-session
@@ -28,7 +28,7 @@ cleanup()
     exit 0
 }
 
-eval `dbus-launch --sh-syntax`
+[ -n "$DBUS_SESSION_BUS_ADDRESS" ] || eval `dbus-launch --sh-syntax`
 
 exec $@ &
 CMD_PID=$!