chiark / gitweb /
core: --user -- move generator directories from /tmp to $XDG_RUNTIME_DIR
[elogind.git] / src / core / manager.c
index f2f473b9f2f0338634d90e60b86f4276ba6a0700..0e35ba5cab9134d3364bbdf30e00a2bff88a3b21 100644 (file)
@@ -22,9 +22,7 @@
 #include <assert.h>
 #include <errno.h>
 #include <string.h>
-#include <sys/epoll.h>
 #include <signal.h>
-#include <sys/signalfd.h>
 #include <sys/wait.h>
 #include <unistd.h>
 #include <sys/poll.h>
@@ -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)
@@ -95,55 +94,7 @@ static int manager_dispatch_signal_fd(sd_event_source *source, int fd, uint32_t
 static int manager_dispatch_time_change_fd(sd_event_source *source, int fd, uint32_t revents, void *userdata);
 static int manager_dispatch_idle_pipe_fd(sd_event_source *source, int fd, uint32_t revents, void *userdata);
 static int manager_dispatch_jobs_in_progress(sd_event_source *source, usec_t usec, void *userdata);
-
-static int manager_setup_notify(Manager *m) {
-        union {
-                struct sockaddr sa;
-                struct sockaddr_un un;
-        } sa = {
-                .sa.sa_family = AF_UNIX,
-        };
-        int one = 1, r;
-
-        m->notify_fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0);
-        if (m->notify_fd < 0) {
-                log_error("Failed to allocate notification socket: %m");
-                return -errno;
-        }
-
-        if (getpid() != 1 || detect_container(NULL) > 0)
-                snprintf(sa.un.sun_path, sizeof(sa.un.sun_path), NOTIFY_SOCKET "/%llu", random_ull());
-        else
-                strncpy(sa.un.sun_path, NOTIFY_SOCKET, sizeof(sa.un.sun_path));
-        sa.un.sun_path[0] = 0;
-
-        r = bind(m->notify_fd, &sa.sa, offsetof(struct sockaddr_un, sun_path) + 1 + strlen(sa.un.sun_path+1));
-        if (r < 0) {
-                log_error("bind() failed: %m");
-                return -errno;
-        }
-
-        r = setsockopt(m->notify_fd, SOL_SOCKET, SO_PASSCRED, &one, sizeof(one));
-        if (r < 0) {
-                log_error("SO_PASSCRED failed: %m");
-                return -errno;
-        }
-
-        r = sd_event_add_io(m->event, m->notify_fd, EPOLLIN, manager_dispatch_notify_fd, m, &m->notify_event_source);
-        if (r < 0) {
-                log_error("Failed to allocate notify event source: %s", strerror(-r));
-                return -errno;
-        }
-
-        sa.un.sun_path[0] = '@';
-        m->notify_socket = strdup(sa.un.sun_path);
-        if (!m->notify_socket)
-                return log_oom();
-
-        log_debug("Using notification socket %s", m->notify_socket);
-
-        return 0;
-}
+static int manager_dispatch_run_queue(sd_event_source *source, void *userdata);
 
 static int manager_watch_jobs_in_progress(Manager *m) {
         assert(m);
@@ -306,7 +257,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;
@@ -367,6 +318,14 @@ static int manager_setup_signals(Manager *m) {
         if (r < 0)
                 return r;
 
+        /* Process signals a bit earlier than the rest of things, but
+         * later that notify_fd processing, so that the notify
+         * processing can still figure out to which process/service a
+         * message belongs, before we reap the process. */
+        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);
 
@@ -402,10 +361,9 @@ static int manager_default_environment(Manager *m) {
         return 0;
 }
 
-int manager_new(SystemdRunningAs running_as, bool reexecuting, Manager **_m) {
+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);
@@ -425,7 +383,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);
@@ -456,34 +414,40 @@ int manager_new(SystemdRunningAs running_as, bool reexecuting, Manager **_m) {
         if (r < 0)
                 goto fail;
 
-        r = manager_setup_signals(m);
+        r = sd_event_add_defer(m->event, manager_dispatch_run_queue, m, &m->run_queue_event_source);
         if (r < 0)
                 goto fail;
 
-        r = manager_setup_cgroup(m);
+        r = sd_event_source_set_priority(m->run_queue_event_source, SD_EVENT_PRIORITY_IDLE);
         if (r < 0)
                 goto fail;
 
-        r = manager_setup_notify(m);
+        r = sd_event_source_set_enabled(m->run_queue_event_source, SD_EVENT_OFF);
         if (r < 0)
                 goto fail;
 
-        r = manager_setup_time_change(m);
+        r = manager_setup_signals(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...");
+        r = manager_setup_cgroup(m);
+        if (r < 0)
+                goto fail;
 
-        /* Try to connect to the busses, if possible. */
-        r = bus_init(m, try_bus_connect);
+        r = manager_setup_time_change(m);
         if (r < 0)
                 goto fail;
 
+        m->udev = udev_new();
+        if (!m->udev) {
+                r = -ENOMEM;
+                goto fail;
+        }
+
+        /* Note that we set up neither kdbus, nor the notify fd
+         * here. We do that after deserialization, since they might
+         * have gotten serialized across the reexec. */
+
         m->taint_usr = dir_is_empty("/usr") > 0;
 
         *_m = m;
@@ -494,6 +458,119 @@ fail:
         return r;
 }
 
+static int manager_setup_notify(Manager *m) {
+        union {
+                struct sockaddr sa;
+                struct sockaddr_un un;
+        } sa = {
+                .sa.sa_family = AF_UNIX,
+        };
+        int one = 1, r;
+
+        if (m->notify_fd < 0) {
+                _cleanup_close_ int fd = -1;
+
+                /* First free all secondary fields */
+                free(m->notify_socket);
+                m->notify_socket = NULL;
+                m->notify_event_source = sd_event_source_unref(m->notify_event_source);
+
+                fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0);
+                if (fd < 0) {
+                        log_error("Failed to allocate notification socket: %m");
+                        return -errno;
+                }
+
+                if (getpid() != 1 || detect_container(NULL) > 0)
+                        snprintf(sa.un.sun_path, sizeof(sa.un.sun_path), NOTIFY_SOCKET "/%" PRIx64, random_u64());
+                else
+                        strncpy(sa.un.sun_path, NOTIFY_SOCKET, sizeof(sa.un.sun_path));
+                sa.un.sun_path[0] = 0;
+
+                r = bind(fd, &sa.sa, offsetof(struct sockaddr_un, sun_path) + 1 + strlen(sa.un.sun_path+1));
+                if (r < 0) {
+                        log_error("bind() failed: %m");
+                        return -errno;
+                }
+
+                r = setsockopt(fd, SOL_SOCKET, SO_PASSCRED, &one, sizeof(one));
+                if (r < 0) {
+                        log_error("SO_PASSCRED failed: %m");
+                        return -errno;
+                }
+
+                sa.un.sun_path[0] = '@';
+                m->notify_socket = strdup(sa.un.sun_path);
+                if (!m->notify_socket)
+                        return log_oom();
+
+                m->notify_fd = fd;
+                fd = -1;
+
+                log_debug("Using notification socket %s", m->notify_socket);
+        }
+
+        if (!m->notify_event_source) {
+                r = sd_event_add_io(m->event, m->notify_fd, EPOLLIN, manager_dispatch_notify_fd, m, &m->notify_event_source);
+                if (r < 0) {
+                        log_error("Failed to allocate notify event source: %s", strerror(-r));
+                        return -errno;
+                }
+
+                /* Process signals a bit earlier than SIGCHLD, so that we can
+                 * still identify to which service an exit message belongs */
+                r = sd_event_source_set_priority(m->notify_event_source, -7);
+                if (r < 0) {
+                        log_error("Failed to set priority of notify event source: %s", strerror(-r));
+                        return r;
+                }
+        }
+
+        return 0;
+}
+
+static int manager_setup_kdbus(Manager *m) {
+        _cleanup_free_ char *p = NULL;
+
+        assert(m);
+
+#ifdef ENABLE_KDBUS
+        if (m->kdbus_fd >= 0)
+                return 0;
+
+        m->kdbus_fd = bus_kernel_create_bus(m->running_as == SYSTEMD_SYSTEM ? "system" : "user", m->running_as == SYSTEMD_SYSTEM, &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);
+
+        /* Create the namespace directory here, so that the contents
+         * of that directory is not visible to non-root users. This is
+         * necessary to ensure that users cannot get access to busses
+         * of virtualized users when no UID namespacing is used. */
+        if (m->running_as == SYSTEMD_SYSTEM)
+                mkdir_p_label("/dev/kdbus/ns", 0700);
+#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);
+}
+
 static unsigned manager_dispatch_cleanup_queue(Manager *m) {
         Unit *u;
         unsigned n = 0;
@@ -662,6 +739,7 @@ void manager_free(Manager *m) {
         sd_event_source_unref(m->time_change_event_source);
         sd_event_source_unref(m->jobs_in_progress_event_source);
         sd_event_source_unref(m->idle_pipe_event_source);
+        sd_event_source_unref(m->run_queue_event_source);
 
         if (m->signal_fd >= 0)
                 close_nointr_nofail(m->signal_fd);
@@ -669,9 +747,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);
@@ -863,6 +944,15 @@ int manager_startup(Manager *m, FILE *serialization, FDSet *fds) {
                         r = q;
         }
 
+        /* We might have deserialized the notify fd, but if we didn't
+         * then let's create the bus now */
+        manager_setup_notify(m);
+
+        /* 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)
@@ -1018,11 +1108,11 @@ 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);
 
-        if (t == _UNIT_TYPE_INVALID || !unit_name_is_valid(name, false))
+        if (t == _UNIT_TYPE_INVALID || !unit_name_is_valid(name, TEMPLATE_INVALID))
                 return sd_bus_error_setf(e, SD_BUS_ERROR_INVALID_ARGS, "Unit name %s is not valid.", name);
 
         ret = manager_get_unit(m, name);
@@ -1119,32 +1209,27 @@ void manager_clear_jobs(Manager *m) {
                 job_finish_and_invalidate(j, JOB_CANCELED, false);
 }
 
-static unsigned manager_dispatch_run_queue(Manager *m) {
+static int manager_dispatch_run_queue(sd_event_source *source, void *userdata) {
+        Manager *m = userdata;
         Job *j;
-        unsigned n = 0;
-
-        if (m->dispatching_run_queue)
-                return 0;
 
-        m->dispatching_run_queue = true;
+        assert(source);
+        assert(m);
 
         while ((j = m->run_queue)) {
                 assert(j->installed);
                 assert(j->in_run_queue);
 
                 job_run_and_invalidate(j);
-                n++;
         }
 
-        m->dispatching_run_queue = false;
-
         if (m->n_running_jobs > 0)
                 manager_watch_jobs_in_progress(m);
 
         if (m->n_on_console > 0)
                 manager_watch_idle_pipe(m);
 
-        return n;
+        return 1;
 }
 
 static unsigned manager_dispatch_dbus_queue(Manager *m) {
@@ -1246,7 +1331,7 @@ static int manager_dispatch_notify_fd(sd_event_source *source, int fd, uint32_t
                 if (!u) {
                         u = manager_get_unit_by_pid(m, ucred->pid);
                         if (!u) {
-                                log_warning("Cannot find unit for notify message of PID %lu.", (unsigned long) ucred->pid);
+                                log_warning("Cannot find unit for notify message of PID "PID_FMT".", ucred->pid);
                                 continue;
                         }
                 }
@@ -1272,7 +1357,6 @@ static int manager_dispatch_sigchld(Manager *m) {
         for (;;) {
                 siginfo_t si = {};
                 Unit *u;
-                int r;
 
                 /* First we call waitd() for a PID and do not reap the
                  * zombie. That way we can still access /proc/$PID for
@@ -1295,17 +1379,9 @@ static int manager_dispatch_sigchld(Manager *m) {
                         _cleanup_free_ char *name = NULL;
 
                         get_process_comm(si.si_pid, &name);
-                        log_debug("Got SIGCHLD for process %lu (%s)", (unsigned long) si.si_pid, strna(name));
+                        log_debug("Got SIGCHLD for process "PID_FMT" (%s)", si.si_pid, strna(name));
                 }
 
-                /* Let's flush any message the dying child might still
-                 * have queued for us. This ensures that the process
-                 * still exists in /proc so that we can figure out
-                 * which cgroup and hence unit it belongs to. */
-                r = manager_dispatch_notify_fd(m->notify_event_source, m->notify_fd, EPOLLIN, m);
-                if (r < 0)
-                        return r;
-
                 /* And now figure out the unit this belongs to */
                 u = hashmap_get(m->watch_pids, LONG_TO_PTR(si.si_pid));
                 if (!u)
@@ -1384,16 +1460,22 @@ static int manager_dispatch_signal_fd(sd_event_source *source, int fd, uint32_t
                 }
 
                 if (sfsi.ssi_pid > 0) {
-                        char *p = NULL;
+                        _cleanup_free_ char *p = NULL;
 
                         get_process_comm(sfsi.ssi_pid, &p);
 
-                        log_debug("Received SIG%s from PID %lu (%s).",
-                                  signal_to_string(sfsi.ssi_signo),
-                                  (unsigned long) sfsi.ssi_pid, strna(p));
-                        free(p);
+                        log_full(sfsi.ssi_signo == SIGCHLD ||
+                                 (sfsi.ssi_signo == SIGTERM && m->running_as == SYSTEMD_USER)
+                                 ? LOG_DEBUG : LOG_INFO,
+                                 "Received SIG%s from PID "PID_FMT" (%s).",
+                                 signal_to_string(sfsi.ssi_signo),
+                                 sfsi.ssi_pid, strna(p));
                 } else
-                        log_debug("Received SIG%s.", signal_to_string(sfsi.ssi_signo));
+                        log_full(sfsi.ssi_signo == SIGCHLD ||
+                                 (sfsi.ssi_signo == SIGTERM && m->running_as == SYSTEMD_USER)
+                                 ? LOG_DEBUG : LOG_INFO,
+                                 "Received SIG%s.",
+                                 signal_to_string(sfsi.ssi_signo));
 
                 switch (sfsi.ssi_signo) {
 
@@ -1578,7 +1660,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;
 }
@@ -1679,9 +1761,6 @@ int manager_loop(Manager *m) {
                 if (manager_dispatch_cgroup_queue(m) > 0)
                         continue;
 
-                if (manager_dispatch_run_queue(m) > 0)
-                        continue;
-
                 if (manager_dispatch_dbus_queue(m) > 0)
                         continue;
 
@@ -1885,16 +1964,16 @@ void manager_dispatch_bus_name_owner_changed(
 }
 
 int manager_open_serialization(Manager *m, FILE **_f) {
-        char *path = NULL;
+        _cleanup_free_ char *path = NULL;
         int fd = -1;
         FILE *f;
 
         assert(_f);
 
         if (m->running_as == SYSTEMD_SYSTEM)
-                asprintf(&path, "/run/systemd/dump-%lu-XXXXXX", (unsigned long) getpid());
+                asprintf(&path, "/run/systemd/dump-"PID_FMT"-XXXXXX", getpid());
         else
-                asprintf(&path, "/tmp/systemd-dump-%lu-XXXXXX", (unsigned long) getpid());
+                asprintf(&path, "/tmp/systemd-dump-"PID_FMT"-XXXXXX", getpid());
 
         if (!path)
                 return -ENOMEM;
@@ -1903,19 +1982,17 @@ int manager_open_serialization(Manager *m, FILE **_f) {
                 fd = mkostemp(path, O_RDWR|O_CLOEXEC);
         }
 
-        if (fd < 0) {
-                free(path);
+        if (fd < 0)
                 return -errno;
-        }
 
         unlink(path);
-
         log_debug("Serializing state to %s", path);
-        free(path);
 
         f = fdopen(fd, "w+");
-        if (!f)
+        if (!f) {
+                close_nointr_nofail(fd);
                 return -errno;
+        }
 
         *_f = f;
 
@@ -1961,11 +2038,34 @@ 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->notify_fd >= 0) {
+                int copy;
+
+                copy = fdset_put_dup(fds, m->notify_fd);
+                if (copy < 0)
+                        return copy;
+
+                fprintf(f, "notify-fd=%i\n", copy);
+                fprintf(f, "notify-socket=%s\n", m->notify_socket);
+        }
+
+        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);
@@ -2056,7 +2156,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;
@@ -2103,6 +2204,45 @@ int manager_deserialize(Manager *m, FILE *f, FDSet *fds) {
 
                         strv_free(m->environment);
                         m->environment = e;
+
+                } else if (startswith(l, "notify-fd=")) {
+                        int fd;
+
+                        if (safe_atoi(l + 10, &fd) < 0 || fd < 0 || !fdset_contains(fds, fd))
+                                log_debug("Failed to parse notify fd: %s", l + 10);
+                        else {
+                                if (m->notify_fd >= 0) {
+                                        m->notify_event_source = sd_event_source_unref(m->notify_event_source);
+                                        close_nointr_nofail(m->notify_fd);
+                                }
+
+                                m->notify_fd = fdset_remove(fds, fd);
+                        }
+
+                } else if (startswith(l, "notify-socket=")) {
+                        char *n;
+
+                        n = strdup(l+14);
+                        if (!n) {
+                                r = -ENOMEM;
+                                goto finish;
+                        }
+
+                        free(m->notify_socket);
+                        m->notify_socket = n;
+
+                } 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);
         }
@@ -2133,10 +2273,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 --;
@@ -2275,8 +2413,9 @@ void manager_check_finished(Manager *m) {
         if (m->n_running_jobs == 0)
                 m->jobs_in_progress_event_source = sd_event_source_unref(m->jobs_in_progress_event_source);
 
-        if (hashmap_size(m->jobs) > 0 && m->jobs_in_progress_event_source) {
-                sd_event_source_set_time(m->jobs_in_progress_event_source, JOBS_IN_PROGRESS_PERIOD_SEC);
+        if (hashmap_size(m->jobs) > 0) {
+                if (m->jobs_in_progress_event_source)
+                        sd_event_source_set_time(m->jobs_in_progress_event_source, JOBS_IN_PROGRESS_PERIOD_SEC);
                 return;
         }
 
@@ -2312,9 +2451,9 @@ void manager_check_finished(Manager *m) {
                         if (!log_on_console())
                                 log_struct(LOG_INFO,
                                            MESSAGE_ID(SD_MESSAGE_STARTUP_FINISHED),
-                                           "KERNEL_USEC=%llu", (unsigned long long) kernel_usec,
-                                           "INITRD_USEC=%llu", (unsigned long long) initrd_usec,
-                                           "USERSPACE_USEC=%llu", (unsigned long long) userspace_usec,
+                                           "KERNEL_USEC="USEC_FMT, kernel_usec,
+                                           "INITRD_USEC="USEC_FMT, initrd_usec,
+                                           "USERSPACE_USEC="USEC_FMT, userspace_usec,
                                            "MESSAGE=Startup finished in %s (kernel) + %s (initrd) + %s (userspace) = %s.",
                                            format_timespan(kernel, sizeof(kernel), kernel_usec, USEC_PER_MSEC),
                                            format_timespan(initrd, sizeof(initrd), initrd_usec, USEC_PER_MSEC),
@@ -2328,8 +2467,8 @@ void manager_check_finished(Manager *m) {
                         if (!log_on_console())
                                 log_struct(LOG_INFO,
                                            MESSAGE_ID(SD_MESSAGE_STARTUP_FINISHED),
-                                           "KERNEL_USEC=%llu", (unsigned long long) kernel_usec,
-                                           "USERSPACE_USEC=%llu", (unsigned long long) userspace_usec,
+                                           "KERNEL_USEC="USEC_FMT, kernel_usec,
+                                           "USERSPACE_USEC="USEC_FMT, userspace_usec,
                                            "MESSAGE=Startup finished in %s (kernel) + %s (userspace) = %s.",
                                            format_timespan(kernel, sizeof(kernel), kernel_usec, USEC_PER_MSEC),
                                            format_timespan(userspace, sizeof(userspace), userspace_usec, USEC_PER_MSEC),
@@ -2343,7 +2482,7 @@ void manager_check_finished(Manager *m) {
                 if (!log_on_console())
                         log_struct(LOG_INFO,
                                    MESSAGE_ID(SD_MESSAGE_STARTUP_FINISHED),
-                                   "USERSPACE_USEC=%llu", (unsigned long long) userspace_usec,
+                                   "USERSPACE_USEC="USEC_FMT, userspace_usec,
                                    "MESSAGE=Startup finished in %s.",
                                    format_timespan(sum, sizeof(sum), total_usec, USEC_PER_MSEC),
                                    NULL);
@@ -2368,11 +2507,29 @@ static int create_generator_dir(Manager *m, char **generator, const char *name)
                 return 0;
 
         if (m->running_as == SYSTEMD_SYSTEM && getpid() == 1) {
+                /* systemd --system, not running --test */
 
                 p = strappend("/run/systemd/", name);
                 if (!p)
                         return log_oom();
 
+                r = mkdir_p_label(p, 0755);
+                if (r < 0) {
+                        log_error("Failed to create generator directory %s: %s",
+                                  p, strerror(-r));
+                        free(p);
+                        return r;
+                }
+        } else if (m->running_as == SYSTEMD_USER) {
+                const char *s = NULL;
+
+                s = getenv("XDG_RUNTIME_DIR");
+                if (!s)
+                        return -EINVAL;
+                p = strjoin(s, "/systemd/", name, NULL);
+                if (!p)
+                        return log_oom();
+
                 r = mkdir_p_label(p, 0755);
                 if (r < 0) {
                         log_error("Failed to create generator directory %s: %s",
@@ -2381,6 +2538,8 @@ static int create_generator_dir(Manager *m, char **generator, const char *name)
                         return r;
                 }
         } else {
+                /* systemd --system --test */
+
                 p = strjoin("/tmp/systemd-", name, ".XXXXXX", NULL);
                 if (!p)
                         return log_oom();