[systemd-commits] src/core

[Colin Walters]

 src/core/manager.c |   18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

New commits:
commit a0a6408e31fef4618e27fafba416b9858f66a8e3
Author: Mantas MikulÄ—nas <grawity at gmail.com>
Date:   Wed Oct 9 14:57:12 2013 +0300

    manager: connect to private bus even if $DBUS_SESSION_BUS_ADDRESS is not set
    
    Because that's exactly the kind of situation where the private bus is
    necessary.

diff --git a/src/core/manager.c b/src/core/manager.c
index b45a2e1..56191bf 100644
--- a/src/core/manager.c
+++ b/src/core/manager.c
@@ -486,6 +486,7 @@ static int manager_default_environment(Manager *m) {
 int manager_new(SystemdRunningAs running_as, bool reexecuting, Manager **_m) {
         Manager *m;
         int r = -ENOMEM;
+        bool try_bus_connect = false;
 
         assert(_m);
         assert(running_as >= 0);
@@ -557,15 +558,18 @@ int manager_new(SystemdRunningAs running_as, bool reexecuting, Manager **_m) {
         if (r < 0)
                 goto fail;
 
-        /* Try to connect to the busses, if possible. */
-        if ((running_as == SYSTEMD_USER && getenv("DBUS_SESSION_BUS_ADDRESS")) ||
-            running_as == SYSTEMD_SYSTEM) {
-                r = bus_init(m, reexecuting || running_as != SYSTEMD_SYSTEM);
-                if (r < 0)
-                        goto fail;
-        } else
+        if (running_as == SYSTEMD_SYSTEM)
+                try_bus_connect = reexecuting;
+        else if (getenv("DBUS_SESSION_BUS_ADDRESS"))
+                try_bus_connect = true;
+        else
                 log_debug("Skipping DBus session bus connection attempt - no DBUS_SESSION_BUS_ADDRESS set...");
 
+        /* Try to connect to the busses, if possible. */
+        r = bus_init(m, try_bus_connect);
+        if (r < 0)
+                goto fail;
+
         m->taint_usr = dir_is_empty("/usr") > 0;
 
         *_m = m;