X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fmanager.c;h=5e627ba9c674dd14b030882aed7335f06818ac0a;hp=5964fc9223807cd584f6bc22f5722901746409c6;hb=33be102a214e7010949496549f4c737b0f8269a3;hpb=c3f6d6757a0923428a82ff617c10635d4ff4b184 diff --git a/src/manager.c b/src/manager.c index 5964fc922..5e627ba9c 100644 --- a/src/manager.c +++ b/src/manager.c @@ -52,6 +52,8 @@ #include "dbus-unit.h" #include "dbus-job.h" #include "missing.h" +#include "path-lookup.h" +#include "special.h" /* As soon as 16 units are in our GC queue, make sure to run a gc sweep */ #define GC_QUEUE_ENTRIES_MAX 16 @@ -59,6 +61,67 @@ /* 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) +/* Where clients shall send notification messages to */ +#define NOTIFY_SOCKET "/org/freedesktop/systemd1/notify" + +static int manager_setup_notify(Manager *m) { + union { + struct sockaddr sa; + struct sockaddr_un un; + } sa; + struct epoll_event ev; + char *ne[2], **t; + int one = 1; + + assert(m); + + m->notify_watch.type = WATCH_NOTIFY; + if ((m->notify_watch.fd = socket(AF_UNIX, SOCK_DGRAM|SOCK_CLOEXEC|SOCK_NONBLOCK, 0)) < 0) { + log_error("Failed to allocate notification socket: %m"); + return -errno; + } + + zero(sa); + sa.sa.sa_family = AF_UNIX; + + if (m->running_as == MANAGER_SESSION) + snprintf(sa.un.sun_path+1, sizeof(sa.un.sun_path)-1, NOTIFY_SOCKET "/%llu", random_ull()); + else + strncpy(sa.un.sun_path+1, NOTIFY_SOCKET, sizeof(sa.un.sun_path)-1); + + if (bind(m->notify_watch.fd, &sa.sa, sizeof(sa)) < 0) { + log_error("bind() failed: %m"); + return -errno; + } + + if (setsockopt(m->notify_watch.fd, SOL_SOCKET, SO_PASSCRED, &one, sizeof(one)) < 0) { + log_error("SO_PASSCRED failed: %m"); + return -errno; + } + + zero(ev); + ev.events = EPOLLIN; + ev.data.ptr = &m->notify_watch; + + if (epoll_ctl(m->epoll_fd, EPOLL_CTL_ADD, m->notify_watch.fd, &ev) < 0) + return -errno; + + if (asprintf(&ne[0], "NOTIFY_SOCKET=@%s", sa.un.sun_path+1) < 0) + return -ENOMEM; + + ne[1] = NULL; + t = strv_env_merge(2, m->environment, ne); + free(ne[0]); + + if (!t) + return -ENOMEM; + + strv_free(m->environment); + m->environment = t; + + return 0; +} + static int enable_special_signals(Manager *m) { char fd; @@ -95,14 +158,23 @@ static int manager_setup_signals(Manager *m) { assert_se(sigaction(SIGCHLD, &sa, NULL) == 0); assert_se(sigemptyset(&mask) == 0); - assert_se(sigaddset(&mask, SIGCHLD) == 0); - assert_se(sigaddset(&mask, SIGTERM) == 0); - assert_se(sigaddset(&mask, SIGHUP) == 0); - assert_se(sigaddset(&mask, SIGUSR1) == 0); - assert_se(sigaddset(&mask, SIGUSR2) == 0); - assert_se(sigaddset(&mask, SIGINT) == 0); /* Kernel sends us this on control-alt-del */ - assert_se(sigaddset(&mask, SIGWINCH) == 0); /* Kernel sends us this on kbrequest (alt-arrowup) */ - assert_se(sigaddset(&mask, SIGPWR) == 0); /* Some kernel drivers and upsd send us this on power failure */ + + sigset_add_many(&mask, + SIGCHLD, /* Child died */ + SIGTERM, /* Reexecute daemon */ + SIGHUP, /* Reload configuration */ + SIGUSR1, /* systemd/upstart: reconnect to D-Bus */ + SIGUSR2, /* systemd: dump status */ + SIGINT, /* Kernel sends us this on control-alt-del */ + SIGWINCH, /* Kernel sends us this on kbrequest (alt-arrowup) */ + SIGPWR, /* Some kernel drivers and upsd send us this on power failure */ + SIGRTMIN+0, /* systemd: start default.target */ + SIGRTMIN+1, /* systemd: start rescue.target */ + SIGRTMIN+2, /* systemd: isolate emergency.target */ + SIGRTMIN+3, /* systemd: start halt.target */ + SIGRTMIN+4, /* systemd: start poweroff.target */ + SIGRTMIN+5, /* systemd: start reboot.target */ + -1); assert_se(sigprocmask(SIG_SETMASK, &mask, NULL) == 0); m->signal_watch.type = WATCH_SIGNAL; @@ -122,227 +194,10 @@ static int manager_setup_signals(Manager *m) { return 0; } -static char** session_dirs(void) { - const char *home, *e; - char *config_home = NULL, *data_home = NULL; - char **config_dirs = NULL, **data_dirs = NULL; - char **r = NULL, **t; - - /* Implement the mechanisms defined in - * - * http://standards.freedesktop.org/basedir-spec/basedir-spec-0.6.html - * - * We look in both the config and the data dirs because we - * want to encourage that distributors ship their unit files - * as data, and allow overriding as configuration. - */ - - home = getenv("HOME"); - - if ((e = getenv("XDG_CONFIG_HOME"))) { - if (asprintf(&config_home, "%s/systemd/session", e) < 0) - goto fail; - - } else if (home) { - if (asprintf(&config_home, "%s/.config/systemd/session", home) < 0) - goto fail; - } - - if ((e = getenv("XDG_CONFIG_DIRS"))) - if (!(config_dirs = strv_split(e, ":"))) - goto fail; - - /* We don't treat /etc/xdg/systemd here as the spec - * suggests because we assume that that is a link to - * /etc/systemd/ anyway. */ - - if ((e = getenv("XDG_DATA_HOME"))) { - if (asprintf(&data_home, "%s/systemd/session", e) < 0) - goto fail; - - } else if (home) { - if (asprintf(&data_home, "%s/.local/share/systemd/session", home) < 0) - goto fail; - } - - if ((e = getenv("XDG_DATA_DIRS"))) - data_dirs = strv_split(e, ":"); - else - data_dirs = strv_new("/usr/local/share", "/usr/share", NULL); - - if (!data_dirs) - goto fail; - - /* Now merge everything we found. */ - if (config_home) { - if (!(t = strv_append(r, config_home))) - goto fail; - strv_free(r); - r = t; - } - - if (!(t = strv_merge_concat(r, config_dirs, "/systemd/session"))) - goto finish; - strv_free(r); - r = t; - - if (!(t = strv_append(r, SESSION_CONFIG_UNIT_PATH))) - goto fail; - strv_free(r); - r = t; - - if (data_home) { - if (!(t = strv_append(r, data_home))) - goto fail; - strv_free(r); - r = t; - } - - if (!(t = strv_merge_concat(r, data_dirs, "/systemd/session"))) - goto fail; - strv_free(r); - r = t; - - if (!(t = strv_append(r, SESSION_DATA_UNIT_PATH))) - goto fail; - strv_free(r); - r = t; - - if (!strv_path_make_absolute_cwd(r)) - goto fail; - -finish: - free(config_home); - strv_free(config_dirs); - free(data_home); - strv_free(data_dirs); - - return r; - -fail: - strv_free(r); - r = NULL; - goto finish; -} - -static int manager_find_paths(Manager *m) { - const char *e; - char *t; - - assert(m); - - /* First priority is whatever has been passed to us via env - * vars */ - if ((e = getenv("SYSTEMD_UNIT_PATH"))) - if (!(m->unit_path = split_path_and_make_absolute(e))) - return -ENOMEM; - - if (strv_isempty(m->unit_path)) { - - /* Nothing is set, so let's figure something out. */ - strv_free(m->unit_path); - - if (m->running_as == MANAGER_SESSION) { - if (!(m->unit_path = session_dirs())) - return -ENOMEM; - } else - if (!(m->unit_path = strv_new( - SYSTEM_CONFIG_UNIT_PATH, /* /etc/systemd/system/ */ - SYSTEM_DATA_UNIT_PATH, /* /lib/systemd/system/ */ - NULL))) - return -ENOMEM; - } - - if (m->running_as == MANAGER_INIT) { - /* /etc/init.d/ compatibility does not matter to users */ - - if ((e = getenv("SYSTEMD_SYSVINIT_PATH"))) - if (!(m->sysvinit_path = split_path_and_make_absolute(e))) - return -ENOMEM; - - if (strv_isempty(m->sysvinit_path)) { - strv_free(m->sysvinit_path); - - if (!(m->sysvinit_path = strv_new( - SYSTEM_SYSVINIT_PATH, /* /etc/init.d/ */ - NULL))) - return -ENOMEM; - } - - if ((e = getenv("SYSTEMD_SYSVRCND_PATH"))) - if (!(m->sysvrcnd_path = split_path_and_make_absolute(e))) - return -ENOMEM; - - if (strv_isempty(m->sysvrcnd_path)) { - strv_free(m->sysvrcnd_path); - - if (!(m->sysvrcnd_path = strv_new( - SYSTEM_SYSVRCND_PATH, /* /etc/rcN.d/ */ - NULL))) - return -ENOMEM; - } - } - - if (m->unit_path) - if (!strv_path_canonicalize(m->unit_path)) - return -ENOMEM; - - if (m->sysvinit_path) - if (!strv_path_canonicalize(m->sysvinit_path)) - return -ENOMEM; - - if (m->sysvrcnd_path) - if (!strv_path_canonicalize(m->sysvrcnd_path)) - return -ENOMEM; - - strv_uniq(m->unit_path); - strv_uniq(m->sysvinit_path); - strv_uniq(m->sysvrcnd_path); - - if (!strv_isempty(m->unit_path)) { - - if (!(t = strv_join(m->unit_path, "\n\t"))) - return -ENOMEM; - log_debug("Looking for unit files in:\n\t%s", t); - free(t); - } else { - log_debug("Ignoring unit files."); - strv_free(m->unit_path); - m->unit_path = NULL; - } - - if (!strv_isempty(m->sysvinit_path)) { - - if (!(t = strv_join(m->sysvinit_path, "\n\t"))) - return -ENOMEM; - - log_debug("Looking for SysV init scripts in:\n\t%s", t); - free(t); - } else { - log_debug("Ignoring SysV init scripts."); - strv_free(m->sysvinit_path); - m->sysvinit_path = NULL; - } - - if (!strv_isempty(m->sysvrcnd_path)) { - - if (!(t = strv_join(m->sysvrcnd_path, "\n\t"))) - return -ENOMEM; - - log_debug("Looking for SysV rcN.d links in:\n\t%s", t); - free(t); - } else { - log_debug("Ignoring SysV rcN.d links."); - strv_free(m->sysvrcnd_path); - m->sysvrcnd_path = NULL; - } - - return 0; -} - int manager_new(ManagerRunningAs running_as, bool confirm_spawn, Manager **_m) { Manager *m; int r = -ENOMEM; + char *p; assert(_m); assert(running_as >= 0); @@ -351,12 +206,13 @@ int manager_new(ManagerRunningAs running_as, bool confirm_spawn, Manager **_m) { if (!(m = new0(Manager, 1))) return -ENOMEM; - m->boot_timestamp = now(CLOCK_REALTIME); + timestamp_get(&m->startup_timestamp); m->running_as = running_as; m->confirm_spawn = confirm_spawn; m->name_data_slot = -1; m->exit_code = _MANAGER_EXIT_CODE_INVALID; + m->pin_cgroupfs_fd = -1; m->signal_watch.fd = m->mount_watch.fd = m->udev_watch.fd = m->epoll_fd = m->dev_autofs_fd = -1; m->current_job_id = 1; /* start as id #1, so that we can leave #0 around as "null-like" value */ @@ -385,7 +241,7 @@ int manager_new(ManagerRunningAs running_as, bool confirm_spawn, Manager **_m) { if ((m->epoll_fd = epoll_create1(EPOLL_CLOEXEC)) < 0) goto fail; - if ((r = manager_find_paths(m)) < 0) + if ((r = lookup_paths_init(&m->lookup_paths, m->running_as)) < 0) goto fail; if ((r = manager_setup_signals(m)) < 0) @@ -394,11 +250,22 @@ int manager_new(ManagerRunningAs running_as, bool confirm_spawn, Manager **_m) { if ((r = manager_setup_cgroup(m)) < 0) goto fail; + if ((r = manager_setup_notify(m)) < 0) + goto fail; + /* Try to connect to the busses, if possible. */ if ((r = bus_init_system(m)) < 0 || (r = bus_init_api(m)) < 0) goto fail; + if (asprintf(&p, "%s/%s", m->cgroup_mount_point, m->cgroup_hierarchy) < 0) { + r = -ENOMEM; + goto fail; + } + + m->pin_cgroupfs_fd = open(p, O_RDONLY|O_CLOEXEC|O_DIRECTORY|O_NOCTTY|O_NONBLOCK); + free(p); + *_m = m; return 0; @@ -538,6 +405,19 @@ static void manager_clear_jobs_and_units(Manager *m) { while ((u = hashmap_first(m->units))) unit_free(u); + + manager_dispatch_cleanup_queue(m); + + assert(!m->load_queue); + assert(!m->run_queue); + assert(!m->dbus_unit_queue); + assert(!m->dbus_job_queue); + assert(!m->cleanup_queue); + assert(!m->gc_queue); + + assert(hashmap_isempty(m->transaction_jobs)); + assert(hashmap_isempty(m->jobs)); + assert(hashmap_isempty(m->units)); } void manager_free(Manager *m) { @@ -545,7 +425,6 @@ void manager_free(Manager *m) { assert(m); - manager_dispatch_cleanup_queue(m); manager_clear_jobs_and_units(m); for (c = 0; c < _UNIT_TYPE_MAX; c++) @@ -569,17 +448,21 @@ void manager_free(Manager *m) { close_nointr_nofail(m->epoll_fd); if (m->signal_watch.fd >= 0) close_nointr_nofail(m->signal_watch.fd); + if (m->notify_watch.fd >= 0) + close_nointr_nofail(m->notify_watch.fd); - strv_free(m->unit_path); - strv_free(m->sysvinit_path); - strv_free(m->sysvrcnd_path); + lookup_paths_free(&m->lookup_paths); strv_free(m->environment); free(m->cgroup_controller); free(m->cgroup_hierarchy); + free(m->cgroup_mount_point); hashmap_free(m->cgroup_bondings); + if (m->pin_cgroupfs_fd >= 0) + close_nointr_nofail(m->pin_cgroupfs_fd); + free(m); } @@ -615,9 +498,8 @@ int manager_coldplug(Manager *m) { if (u->meta.id != k) continue; - if (UNIT_VTABLE(u)->coldplug) - if ((q = UNIT_VTABLE(u)->coldplug(u)) < 0) - r = q; + if ((q = unit_coldplug(u)) < 0) + r = q; } return r; @@ -954,20 +836,25 @@ static int transaction_verify_order_one(Manager *m, Job *j, Job *from, unsigned /* Does a recursive sweep through the ordering graph, looking * for a cycle. If we find cycle we try to break it. */ - /* Did we find a cycle? */ - if (j->marker && j->generation == generation) { + /* Have we seen this before? */ + if (j->generation == generation) { Job *k; - /* So, we already have been here. We have a - * cycle. Let's try to break it. We go backwards in - * our path and try to find a suitable job to - * remove. We use the marker to find our way back, - * since smart how we are we stored our way back in - * there. */ + /* If the marker is NULL we have been here already and + * decided the job was loop-free from here. Hence + * shortcut things and return right-away. */ + if (!j->marker) + return 0; + /* So, the marker is not NULL and we already have been + * here. We have a cycle. Let's try to break it. We go + * backwards in our path and try to find a suitable + * job to remove. We use the marker to find our way + * back, since smart how we are we stored our way back + * in there. */ log_debug("Found ordering cycle on %s/%s", j->unit->meta.id, job_type_to_string(j->type)); - for (k = from; k; k = (k->generation == generation ? k->marker : NULL)) { + for (k = from; k; k = ((k->generation == generation && k->marker != k) ? k->marker : NULL)) { log_debug("Walked on cycle path to %s/%s", k->unit->meta.id, job_type_to_string(k->type)); @@ -992,8 +879,10 @@ static int transaction_verify_order_one(Manager *m, Job *j, Job *from, unsigned } /* Make the marker point to where we come from, so that we can - * find our way backwards if we want to break a cycle */ - j->marker = from; + * find our way backwards if we want to break a cycle. We use + * a special marker for the beginning: we point to + * ourselves. */ + j->marker = from ? from : j; j->generation = generation; /* We assume that the the dependencies are bidirectional, and @@ -1025,6 +914,7 @@ static int transaction_verify_order(Manager *m, unsigned *generation) { Job *j; int r; Iterator i; + unsigned g; assert(m); assert(generation); @@ -1032,8 +922,10 @@ static int transaction_verify_order(Manager *m, unsigned *generation) { /* Check if the ordering graph is cyclic. If it is, try to fix * that up by dropping one of the jobs. */ + g = (*generation)++; + HASHMAP_FOREACH(j, m->transaction_jobs, i) - if ((r = transaction_verify_order_one(m, j, NULL, (*generation)++)) < 0) + if ((r = transaction_verify_order_one(m, j, NULL, g)) < 0) return r; return 0; @@ -1719,12 +1611,82 @@ unsigned manager_dispatch_dbus_queue(Manager *m) { return n; } +static int manager_process_notify_fd(Manager *m) { + ssize_t n; + + assert(m); + + for (;;) { + char buf[4096]; + struct msghdr msghdr; + struct iovec iovec; + struct ucred *ucred; + union { + struct cmsghdr cmsghdr; + uint8_t buf[CMSG_SPACE(sizeof(struct ucred))]; + } control; + Unit *u; + char **tags; + + zero(iovec); + iovec.iov_base = buf; + iovec.iov_len = sizeof(buf)-1; + + zero(control); + zero(msghdr); + msghdr.msg_iov = &iovec; + msghdr.msg_iovlen = 1; + msghdr.msg_control = &control; + msghdr.msg_controllen = sizeof(control); + + if ((n = recvmsg(m->notify_watch.fd, &msghdr, MSG_DONTWAIT)) <= 0) { + if (n >= 0) + return -EIO; + + if (errno == EAGAIN) + break; + + return -errno; + } + + if (msghdr.msg_controllen < CMSG_LEN(sizeof(struct ucred)) || + control.cmsghdr.cmsg_level != SOL_SOCKET || + control.cmsghdr.cmsg_type != SCM_CREDENTIALS || + control.cmsghdr.cmsg_len != CMSG_LEN(sizeof(struct ucred))) { + log_warning("Received notify message without credentials. Ignoring."); + continue; + } + + ucred = (struct ucred*) CMSG_DATA(&control.cmsghdr); + + if (!(u = hashmap_get(m->watch_pids, UINT32_TO_PTR(ucred->pid)))) + if (!(u = cgroup_unit_by_pid(m, ucred->pid))) { + log_warning("Cannot find unit for notify message of PID %lu.", (unsigned long) ucred->pid); + continue; + } + + char_array_0(buf); + if (!(tags = strv_split(buf, "\n\r"))) + return -ENOMEM; + + log_debug("Got notification message for unit %s", u->meta.id); + + if (UNIT_VTABLE(u)->notify_message) + UNIT_VTABLE(u)->notify_message(u, tags); + + strv_free(tags); + } + + return 0; +} + static int manager_dispatch_sigchld(Manager *m) { assert(m); for (;;) { siginfo_t si; Unit *u; + int r; zero(si); @@ -1753,6 +1715,17 @@ static int manager_dispatch_sigchld(Manager *m) { free(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. */ + if ((r = manager_process_notify_fd(m)) < 0) + return r; + + /* And now figure out the unit this belongs to */ + if (!(u = hashmap_get(m->watch_pids, UINT32_TO_PTR(si.si_pid)))) + u = cgroup_unit_by_pid(m, si.si_pid); + /* And now, we actually reap the zombie. */ if (waitid(P_PID, si.si_pid, &si, WEXITED) < 0) { if (errno == EINTR) @@ -1770,22 +1743,25 @@ static int manager_dispatch_sigchld(Manager *m) { si.si_status, strna(si.si_code == CLD_EXITED ? exit_status_to_string(si.si_status) : strsignal(si.si_status))); - if (!(u = hashmap_remove(m->watch_pids, UINT32_TO_PTR(si.si_pid)))) + if (!u) continue; log_debug("Child %llu belongs to %s", (long long unsigned) si.si_pid, u->meta.id); + hashmap_remove(m->watch_pids, UINT32_TO_PTR(si.si_pid)); UNIT_VTABLE(u)->sigchld_event(u, si.si_pid, si.si_code, si.si_status); } return 0; } -static void manager_start_target(Manager *m, const char *name) { +static int manager_start_target(Manager *m, const char *name, JobMode mode) { int r; - if ((r = manager_add_job_by_name(m, JOB_START, name, JOB_REPLACE, true, NULL)) < 0) + if ((r = manager_add_job_by_name(m, JOB_START, name, mode, true, NULL)) < 0) log_error("Failed to enqueue %s job: %s", name, strerror(-r)); + + return r; } static int manager_process_signal_fd(Manager *m) { @@ -1814,34 +1790,39 @@ static int manager_process_signal_fd(Manager *m) { break; case SIGTERM: - if (m->running_as == MANAGER_INIT) + if (m->running_as == MANAGER_INIT) { /* This is for compatibility with the * original sysvinit */ m->exit_code = MANAGER_REEXECUTE; - else - m->exit_code = MANAGER_EXIT; + break; + } - return 0; + /* Fall through */ case SIGINT: if (m->running_as == MANAGER_INIT) { - manager_start_target(m, SPECIAL_CTRL_ALT_DEL_TARGET); + manager_start_target(m, SPECIAL_CTRL_ALT_DEL_TARGET, JOB_REPLACE); break; } - m->exit_code = MANAGER_EXIT; - return 0; + /* Run the exit target if there is one, if not, just exit. */ + if (manager_start_target(m, SPECIAL_EXIT_SERVICE, JOB_REPLACE) < 0) { + m->exit_code = MANAGER_EXIT; + return 0; + } + + break; case SIGWINCH: if (m->running_as == MANAGER_INIT) - manager_start_target(m, SPECIAL_KBREQUEST_TARGET); + manager_start_target(m, SPECIAL_KBREQUEST_TARGET, JOB_REPLACE); /* This is a nop on non-init */ break; case SIGPWR: if (m->running_as == MANAGER_INIT) - manager_start_target(m, SPECIAL_SIGPWR_TARGET); + manager_start_target(m, SPECIAL_SIGPWR_TARGET, JOB_REPLACE); /* This is a nop on non-init */ break; @@ -1859,24 +1840,63 @@ static int manager_process_signal_fd(Manager *m) { if (!u || !UNIT_IS_ACTIVE_OR_ACTIVATING(unit_active_state(u))) { log_info("Loading D-Bus service..."); - manager_start_target(m, SPECIAL_DBUS_SERVICE); + manager_start_target(m, SPECIAL_DBUS_SERVICE, JOB_REPLACE); } break; } - case SIGUSR2: - manager_dump_units(m, stdout, "\t"); - manager_dump_jobs(m, stdout, "\t"); + case SIGUSR2: { + FILE *f; + char *dump = NULL; + size_t size; + + if (!(f = open_memstream(&dump, &size))) { + log_warning("Failed to allocate memory stream."); + break; + } + + manager_dump_units(m, f, "\t"); + manager_dump_jobs(m, f, "\t"); + + if (ferror(f)) { + fclose(f); + free(dump); + log_warning("Failed to write status stream"); + break; + } + + fclose(f); + log_dump(LOG_INFO, dump); + free(dump); + break; + } case SIGHUP: m->exit_code = MANAGER_RELOAD; break; - default: + default: { + static const char * const table[] = { + [0] = SPECIAL_DEFAULT_TARGET, + [1] = SPECIAL_RESCUE_TARGET, + [2] = SPECIAL_EMERGENCY_SERVICE, + [3] = SPECIAL_HALT_TARGET, + [4] = SPECIAL_POWEROFF_TARGET, + [5] = SPECIAL_REBOOT_TARGET + }; + + if ((int) sfsi.ssi_signo >= SIGRTMIN+0 && + (int) sfsi.ssi_signo < SIGRTMIN+(int) ELEMENTSOF(table)) { + manager_start_target(m, table[sfsi.ssi_signo - SIGRTMIN], + sfsi.ssi_signo == 2 ? JOB_ISOLATE : JOB_REPLACE); + break; + } + log_info("Got unhandled signal <%s>.", strsignal(sfsi.ssi_signo)); } + } } if (sigchld) @@ -1907,6 +1927,17 @@ static int process_event(Manager *m, struct epoll_event *ev) { break; + case WATCH_NOTIFY: + + /* An incoming daemon notification event? */ + if (ev->events != EPOLLIN) + return -EINVAL; + + if ((r = manager_process_notify_fd(m)) < 0) + return r; + + break; + case WATCH_FD: /* Some fd event, to be dispatched to the units */ @@ -2091,7 +2122,7 @@ void manager_write_utmp_reboot(Manager *m) { if (!manager_utmp_good(m)) return; - if ((r = utmp_put_reboot(m->boot_timestamp)) < 0) { + if ((r = utmp_put_reboot(m->startup_timestamp.realtime)) < 0) { if (r != -ENOENT && r != -EROFS) log_warning("Failed to write utmp/wtmp: %s", strerror(-r)); @@ -2286,6 +2317,11 @@ int manager_reload(Manager *m) { /* From here on there is no way back. */ manager_clear_jobs_and_units(m); + /* Find new unit paths */ + lookup_paths_free(&m->lookup_paths); + if ((q = lookup_paths_init(&m->lookup_paths, m->running_as)) < 0) + r = q; + /* First, enumerate what we can from all config files */ if ((q = manager_enumerate(m)) < 0) r = q;