Merge authors:
Dimitri John Ledkov (xnox)
Related merge proposals:
https://code.launchpad.net/~xnox/upstart/empty-session/+merge/216338
proposed by: Dimitri John Ledkov (xnox)
review: Approve - James Hunt (jamesodhunt)
------------------------------------------------------------
revno: 1616 [merge]
committer: James Hunt <[email protected]>
branch nick: upstart
timestamp: Thu 2014-04-17 16:43:36 +0100
message:
* Merge of lp:~xnox/upstart/empty-session.
modified:
util/initctl.c
--
lp:upstart
https://code.launchpad.net/~upstart-devel/upstart/trunk
Your team Upstart Reviewers is subscribed to branch lp:upstart.
To unsubscribe from this branch go to
https://code.launchpad.net/~upstart-devel/upstart/trunk/+edit-subscription
=== modified file 'util/initctl.c'
--- util/initctl.c 2014-04-09 12:58:58 +0000
+++ util/initctl.c 2014-04-17 14:56:06 +0000
@@ -333,7 +333,7 @@
user_addr = getenv ("UPSTART_SESSION");
- if (user_addr && dbus_bus_type < 0) {
+ if (user_addr && user_addr[0] && dbus_bus_type < 0) {
user_mode = TRUE;
}
--
upstart-devel mailing list
[email protected]
Modify settings or unsubscribe at:
https://lists.ubuntu.com/mailman/listinfo/upstart-devel
