diff options
| author | Martin Pitt <martin.pitt@canonical.com> | 2016-10-25 21:23:18 +0200 |
|---|---|---|
| committer | Martin Pitt <martin.pitt@canonical.com> | 2016-10-25 21:23:18 +0200 |
| commit | 55a51a6de52ae9fe1d6dc6914a2b0d93f3b229eb (patch) | |
| tree | d7f879b45dab9a7546d00d33f6e8793c3b2d5199 | |
| parent | 481fa88f2c2a8b2aa96d8f263caec679528c1508 (diff) | |
| download | lightdm-git-55a51a6de52ae9fe1d6dc6914a2b0d93f3b229eb.tar.gz | |
debian/lightdm-greeter-session: Don't launch another session D-Bus if one
is already running (usually from dbus-user-session).
| -rw-r--r-- | debian/changelog | 7 | ||||
| -rw-r--r-- | debian/lightdm-greeter-session | 2 |
2 files changed, 8 insertions, 1 deletions
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=$! |