X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fcore%2Fmanager.c;h=a2f3570bb624eb66680896fc45378803dc80e0c6;hp=c424fece52f385170264f3eae032c58fc1d3de17;hb=7b77ed8cf36e8eca6017791626044b61ae2d68e7;hpb=752b590500cdfe8e60800c0553bf7ae3ac613ffd diff --git a/src/core/manager.c b/src/core/manager.c index c424fece5..a2f3570bb 100644 --- a/src/core/manager.c +++ b/src/core/manager.c @@ -22,9 +22,7 @@ #include #include #include -#include #include -#include #include #include #include @@ -76,6 +74,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) @@ -307,7 +306,7 @@ static int enable_special_signals(Manager *m) { } else { /* Enable that we get SIGWINCH on kbrequest */ if (ioctl(fd, KDSIGACCEPT, SIGWINCH) < 0) - log_warning("Failed to enable kbrequest handling: %s", strerror(errno)); + log_warning("Failed to enable kbrequest handling: %m"); } return 0; @@ -368,6 +367,11 @@ static int manager_setup_signals(Manager *m) { if (r < 0) return r; + /* Process signals a bit earlier than the rest of things */ + r = sd_event_source_set_priority(m->signal_event_source, -5); + if (r < 0) + return r; + if (m->running_as == SYSTEMD_SYSTEM) return enable_special_signals(m); @@ -403,10 +407,48 @@ 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); + +#ifdef ENABLE_KDBUS + 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_bus(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_debug("Successfully set up kdbus on %s", p); +#endif + + 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); @@ -426,7 +468,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); @@ -485,17 +527,11 @@ int manager_new(SystemdRunningAs running_as, bool reexecuting, Manager **_m) { if (r < 0) 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) + m->udev = udev_new(); + if (!m->udev) { + r = -ENOMEM; goto fail; + } m->taint_usr = dir_is_empty("/usr") > 0; @@ -683,9 +719,12 @@ 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); + udev_unref(m->udev); sd_event_unref(m->event); free(m->notify_socket); @@ -877,6 +916,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) @@ -1032,7 +1076,7 @@ int manager_load_unit_prepare( return sd_bus_error_setf(e, SD_BUS_ERROR_INVALID_ARGS, "Path %s is not absolute.", path); if (!name) - name = path_get_file_name(path); + name = basename(path); t = unit_name_to_type(name); @@ -1587,7 +1631,7 @@ static int manager_dispatch_signal_fd(sd_event_source *source, int fd, uint32_t } if (sigchld) - return manager_dispatch_sigchld(m); + manager_dispatch_sigchld(m); return 0; } @@ -1967,11 +2011,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); @@ -2062,7 +2118,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; @@ -2109,6 +2166,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 || 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); } @@ -2139,10 +2209,8 @@ int manager_deserialize(Manager *m, FILE *f, FDSet *fds) { } finish: - if (ferror(f)) { + if (ferror(f)) r = -EIO; - goto finish; - } assert(m->n_reloading > 0); m->n_reloading --;