diff options
Diffstat (limited to 'src/core')
| -rw-r--r-- | src/core/main.c | 2 | ||||
| -rw-r--r-- | src/core/manager.c | 95 | ||||
| -rw-r--r-- | src/core/manager.h | 5 |
3 files changed, 81 insertions, 21 deletions
diff --git a/src/core/main.c b/src/core/main.c index 69d3a43840..6c3d9bfb18 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -1531,7 +1531,7 @@ int main(int argc, char *argv[]) { if (arg_running_as == SYSTEMD_SYSTEM) bump_rlimit_nofile(&saved_rlimit_nofile); - r = manager_new(arg_running_as, !!serialization, &m); + r = manager_new(arg_running_as, &m); if (r < 0) { log_error("Failed to allocate manager object: %s", strerror(-r)); goto finish; diff --git a/src/core/manager.c b/src/core/manager.c index 65cb73cc9f..a168589e38 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -76,6 +76,7 @@ #include "dbus-unit.h" #include "dbus-job.h" #include "dbus-manager.h" +#include "bus-kernel.h" /* As soon as 5s passed since a unit was added to our GC queue, make sure to run a gc sweep */ #define GC_QUEUE_USEC_MAX (10*USEC_PER_SEC) @@ -408,10 +409,45 @@ static int manager_default_environment(Manager *m) { return 0; } -int manager_new(SystemdRunningAs running_as, bool reexecuting, Manager **_m) { +static int manager_setup_kdbus(Manager *m) { + _cleanup_free_ char *p = NULL; + + assert(m); + + if (m->kdbus_fd >= 0) + return 0; + + /* If there's already a bus address set, don't set up kdbus */ + if (m->running_as == SYSTEMD_USER && getenv("DBUS_SESSION_BUS_ADDRESS")) + return 0; + + m->kdbus_fd = bus_kernel_create(m->running_as == SYSTEMD_SYSTEM ? "system" : "user", &p); + if (m->kdbus_fd < 0) { + log_debug("Failed to set up kdbus: %s", strerror(-m->kdbus_fd)); + return m->kdbus_fd; + } + + log_info("Successfully set up kdbus on %s", p); + return 0; +} + +static int manager_connect_bus(Manager *m, bool reexecuting) { + bool try_bus_connect; + + assert(m); + + try_bus_connect = + m->kdbus_fd >= 0 || + reexecuting || + (m->running_as == SYSTEMD_USER && getenv("DBUS_SESSION_BUS_ADDRESS")); + + /* Try to connect to the busses, if possible. */ + return bus_init(m, try_bus_connect); +} + +int manager_new(SystemdRunningAs running_as, Manager **_m) { Manager *m; - int r = -ENOMEM; - bool try_bus_connect = false; + int r; assert(_m); assert(running_as >= 0); @@ -431,7 +467,7 @@ int manager_new(SystemdRunningAs running_as, bool reexecuting, Manager **_m) { m->idle_pipe[0] = m->idle_pipe[1] = m->idle_pipe[2] = m->idle_pipe[3] = -1; - m->pin_cgroupfs_fd = m->notify_fd = m->signal_fd = m->time_change_fd = m->dev_autofs_fd = m->private_listen_fd = -1; + m->pin_cgroupfs_fd = m->notify_fd = m->signal_fd = m->time_change_fd = m->dev_autofs_fd = m->private_listen_fd = m->kdbus_fd = -1; m->current_job_id = 1; /* start as id #1, so that we can leave #0 around as "null-like" value */ r = manager_default_environment(m); @@ -496,18 +532,6 @@ int manager_new(SystemdRunningAs running_as, bool reexecuting, Manager **_m) { goto fail; } - 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; @@ -694,6 +718,8 @@ void manager_free(Manager *m) { close_nointr_nofail(m->notify_fd); if (m->time_change_fd >= 0) close_nointr_nofail(m->time_change_fd); + if (m->kdbus_fd >= 0) + close_nointr_nofail(m->kdbus_fd); manager_close_idle_pipe(m); @@ -889,6 +915,11 @@ int manager_startup(Manager *m, FILE *serialization, FDSet *fds) { r = q; } + /* We might have deserialized the kdbus control fd, but if we + * didn't, then let's create the bus now. */ + manager_setup_kdbus(m); + manager_connect_bus(m, !!serialization); + /* Third, fire things up! */ q = manager_coldplug(m); if (q < 0) @@ -1979,11 +2010,23 @@ int manager_serialize(Manager *m, FILE *f, FDSet *fds, bool switching_root) { _cleanup_free_ char *ce; ce = cescape(*e); - if (ce) - fprintf(f, "env=%s\n", *e); + if (!ce) + return -ENOMEM; + + fprintf(f, "env=%s\n", *e); } } + if (m->kdbus_fd >= 0) { + int copy; + + copy = fdset_put_dup(fds, m->kdbus_fd); + if (copy < 0) + return copy; + + fprintf(f, "kdbus-fd=%i\n", copy); + } + bus_serialize(m, f); fputc('\n', f); @@ -2074,7 +2117,8 @@ int manager_deserialize(Manager *m, FILE *f, FDSet *fds) { } else if (startswith(l, "taint-usr=")) { int b; - if ((b = parse_boolean(l+10)) < 0) + b = parse_boolean(l+10); + if (b < 0) log_debug("Failed to parse taint /usr flag %s", l+10); else m->taint_usr = m->taint_usr || b; @@ -2121,6 +2165,19 @@ int manager_deserialize(Manager *m, FILE *f, FDSet *fds) { strv_free(m->environment); m->environment = e; + + } else if (startswith(l, "kdbus-fd=")) { + int fd; + + if (safe_atoi(l + 9, &fd) < 0 || !fdset_contains(fds, fd)) + log_debug("Failed to parse kdbus fd: %s", l + 9); + else { + if (m->kdbus_fd >= 0) + close_nointr_nofail(m->kdbus_fd); + + m->kdbus_fd = fdset_remove(fds, fd); + } + } else if (bus_deserialize_item(m, l) == 0) log_debug("Unknown serialization item '%s'", l); } diff --git a/src/core/manager.h b/src/core/manager.h index bf05812fc5..fdf60ae696 100644 --- a/src/core/manager.h +++ b/src/core/manager.h @@ -234,9 +234,12 @@ struct Manager { * them. It's a hashmap with a path string as key and a Set as * value where Unit objects are contained. */ Hashmap *units_requiring_mounts_for; + + /* Reference to the kdbus bus control fd */ + int kdbus_fd; }; -int manager_new(SystemdRunningAs running_as, bool reexecuting, Manager **m); +int manager_new(SystemdRunningAs running_as, Manager **m); void manager_free(Manager *m); int manager_enumerate(Manager *m); |