goto fail;
/* Try to connect to the busses, if possible. */
- r = bus_init(m, running_as != SYSTEMD_SYSTEM);
- if (r < 0)
- goto fail;
+ if ((running_as == SYSTEMD_USER && getenv("DBUS_SESSION_BUS_ADDRESS")) ||
+ running_as == SYSTEMD_SYSTEM) {
+ r = bus_init(m, running_as != SYSTEMD_SYSTEM);
+ if (r < 0)
+ goto fail;
+ } else
+ log_debug("Skipping DBus session bus connection attempt - no DBUS_SESSION_BUS_ADDRESS set...");
m->taint_usr = dir_is_empty("/usr") > 0;
remove_generator_dir(m, &m->generator_unit_path_late);
}
+int manager_set_default_environment(Manager *m, char **environment) {
+
+ char **e = NULL;
+ assert(m);
+ e = strv_env_merge(2, m->environment, environment);
+ if (!e)
+ return -ENOMEM;
+ strv_free(m->environment);
+ m->environment = e;
+ return 0;
+}
+
int manager_set_default_controllers(Manager *m, char **controllers) {
char **l;