X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Fmanager.c;h=8d016b9f5de405bb83e53b97a7f8a54da4d7054b;hp=5e627ba9c674dd14b030882aed7335f06818ac0a;hb=55096547212928b0ba83fca2595cae0d66d3c0b0;hpb=33be102a214e7010949496549f4c737b0f8269a3 diff --git a/src/manager.c b/src/manager.c index 5e627ba9c..8d016b9f5 100644 --- a/src/manager.c +++ b/src/manager.c @@ -32,7 +32,6 @@ #include #include #include -#include #include #include #include @@ -54,6 +53,7 @@ #include "missing.h" #include "path-lookup.h" #include "special.h" +#include "bus-errors.h" /* As soon as 16 units are in our GC queue, make sure to run a gc sweep */ #define GC_QUEUE_ENTRIES_MAX 16 @@ -70,7 +70,6 @@ static int manager_setup_notify(Manager *m) { struct sockaddr_un un; } sa; struct epoll_event ev; - char *ne[2], **t; int one = 1; assert(m); @@ -84,7 +83,7 @@ static int manager_setup_notify(Manager *m) { zero(sa); sa.sa.sa_family = AF_UNIX; - if (m->running_as == MANAGER_SESSION) + if (getpid() != 1) 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); @@ -106,19 +105,9 @@ static int manager_setup_notify(Manager *m) { 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) + if (!(m->notify_socket = strdup(sa.un.sun_path+1))) 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; } @@ -188,13 +177,13 @@ static int manager_setup_signals(Manager *m) { if (epoll_ctl(m->epoll_fd, EPOLL_CTL_ADD, m->signal_watch.fd, &ev) < 0) return -errno; - if (m->running_as == MANAGER_INIT) + if (m->running_as == MANAGER_SYSTEM) return enable_special_signals(m); return 0; } -int manager_new(ManagerRunningAs running_as, bool confirm_spawn, Manager **_m) { +int manager_new(ManagerRunningAs running_as, Manager **_m) { Manager *m; int r = -ENOMEM; char *p; @@ -206,11 +195,10 @@ int manager_new(ManagerRunningAs running_as, bool confirm_spawn, Manager **_m) { if (!(m = new0(Manager, 1))) return -ENOMEM; - timestamp_get(&m->startup_timestamp); + dual_timestamp_get(&m->startup_timestamp); m->running_as = running_as; - m->confirm_spawn = confirm_spawn; - m->name_data_slot = -1; + m->name_data_slot = m->subscribed_data_slot = -1; m->exit_code = _MANAGER_EXIT_CODE_INVALID; m->pin_cgroupfs_fd = -1; @@ -254,8 +242,7 @@ int manager_new(ManagerRunningAs running_as, bool confirm_spawn, Manager **_m) { goto fail; /* Try to connect to the busses, if possible. */ - if ((r = bus_init_system(m)) < 0 || - (r = bus_init_api(m)) < 0) + if ((r = bus_init(m)) < 0) goto fail; if (asprintf(&p, "%s/%s", m->cgroup_mount_point, m->cgroup_hierarchy) < 0) { @@ -283,7 +270,7 @@ static unsigned manager_dispatch_cleanup_queue(Manager *m) { while ((meta = m->cleanup_queue)) { assert(meta->in_cleanup_queue); - unit_free(UNIT(meta)); + unit_free((Unit*) meta); n++; } @@ -373,7 +360,7 @@ static unsigned manager_dispatch_gc_queue(Manager *m) { while ((meta = m->gc_queue)) { assert(meta->in_gc_queue); - unit_gc_sweep(UNIT(meta), gc_marker); + unit_gc_sweep((Unit*) meta, gc_marker); LIST_REMOVE(Meta, gc_queue, m->gc_queue, meta); meta->in_gc_queue = false; @@ -384,7 +371,7 @@ static unsigned manager_dispatch_gc_queue(Manager *m) { meta->gc_marker == gc_marker + GC_OFFSET_UNSURE) { log_debug("Collecting %s", meta->id); meta->gc_marker = gc_marker + GC_OFFSET_BAD; - unit_add_to_cleanup_queue(UNIT(meta)); + unit_add_to_cleanup_queue((Unit*) meta); } } @@ -433,10 +420,10 @@ void manager_free(Manager *m) { /* If we reexecute ourselves, we keep the root cgroup * around */ - manager_shutdown_cgroup(m, m->exit_code != MANAGER_REEXECUTE); + if (m->exit_code != MANAGER_REEXECUTE) + manager_shutdown_cgroup(m); - bus_done_api(m); - bus_done_system(m); + bus_done(m); hashmap_free(m->units); hashmap_free(m->jobs); @@ -451,10 +438,11 @@ void manager_free(Manager *m) { if (m->notify_watch.fd >= 0) close_nointr_nofail(m->notify_watch.fd); + free(m->notify_socket); + lookup_paths_free(&m->lookup_paths); strv_free(m->environment); - free(m->cgroup_controller); free(m->cgroup_hierarchy); free(m->cgroup_mount_point); @@ -701,7 +689,7 @@ static int delete_one_unmergeable_job(Manager *m, Job *j) { return -ENOEXEC; /* Ok, we can drop one, so let's do so. */ - log_debug("Trying to fix job merging by deleting job %s/%s", d->unit->meta.id, job_type_to_string(d->type)); + log_notice("Trying to fix job merging by deleting job %s/%s", d->unit->meta.id, job_type_to_string(d->type)); transaction_delete_job(m, d, true); return 0; } @@ -709,7 +697,7 @@ static int delete_one_unmergeable_job(Manager *m, Job *j) { return -EINVAL; } -static int transaction_merge_jobs(Manager *m) { +static int transaction_merge_jobs(Manager *m, DBusError *e) { Job *j; Iterator i; int r; @@ -738,6 +726,8 @@ static int transaction_merge_jobs(Manager *m) { return -EAGAIN; /* We couldn't merge anything. Failure */ + dbus_set_error(e, BUS_ERROR_TRANSACTION_JOBS_CONFLICTING, "Transaction contains conflicting jobs '%s' and '%s' for %s. Probably contradicting requirement dependencies configured.", + job_type_to_string(t), job_type_to_string(k->type), k->unit->meta.id); return r; } } @@ -824,7 +814,7 @@ static bool unit_matters_to_anchor(Unit *u, Job *j) { return false; } -static int transaction_verify_order_one(Manager *m, Job *j, Job *from, unsigned generation) { +static int transaction_verify_order_one(Manager *m, Job *j, Job *from, unsigned generation, DBusError *e) { Iterator i; Unit *u; int r; @@ -852,17 +842,17 @@ static int transaction_verify_order_one(Manager *m, Job *j, Job *from, unsigned * 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)); + log_warning("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 != k) ? k->marker : NULL)) { - log_debug("Walked on cycle path to %s/%s", k->unit->meta.id, job_type_to_string(k->type)); + log_info("Walked on cycle path to %s/%s", k->unit->meta.id, job_type_to_string(k->type)); if (!k->installed && !unit_matters_to_anchor(k->unit, k)) { /* Ok, we can drop this one, so let's * do so. */ - log_debug("Breaking order cycle by deleting job %s/%s", k->unit->meta.id, job_type_to_string(k->type)); + log_warning("Breaking order cycle by deleting job %s/%s", k->unit->meta.id, job_type_to_string(k->type)); transaction_delete_unit(m, k->unit); return -EAGAIN; } @@ -873,8 +863,9 @@ static int transaction_verify_order_one(Manager *m, Job *j, Job *from, unsigned break; } - log_debug("Unable to break cycle"); + log_error("Unable to break cycle"); + dbus_set_error(e, BUS_ERROR_TRANSACTION_ORDER_IS_CYCLIC, "Transaction order is cyclic. See logs for details."); return -ENOEXEC; } @@ -899,7 +890,7 @@ static int transaction_verify_order_one(Manager *m, Job *j, Job *from, unsigned if (!(o = u->meta.job)) continue; - if ((r = transaction_verify_order_one(m, o, j, generation)) < 0) + if ((r = transaction_verify_order_one(m, o, j, generation, e)) < 0) return r; } @@ -910,7 +901,7 @@ static int transaction_verify_order_one(Manager *m, Job *j, Job *from, unsigned return 0; } -static int transaction_verify_order(Manager *m, unsigned *generation) { +static int transaction_verify_order(Manager *m, unsigned *generation, DBusError *e) { Job *j; int r; Iterator i; @@ -925,7 +916,7 @@ static int transaction_verify_order(Manager *m, unsigned *generation) { g = (*generation)++; HASHMAP_FOREACH(j, m->transaction_jobs, i) - if ((r = transaction_verify_order_one(m, j, NULL, g)) < 0) + if ((r = transaction_verify_order_one(m, j, NULL, g, e)) < 0) return r; return 0; @@ -957,7 +948,7 @@ static void transaction_collect_garbage(Manager *m) { } while (again); } -static int transaction_is_destructive(Manager *m) { +static int transaction_is_destructive(Manager *m, DBusError *e) { Iterator i; Job *j; @@ -974,8 +965,11 @@ static int transaction_is_destructive(Manager *m) { if (j->unit->meta.job && j->unit->meta.job != j && - !job_type_is_superset(j->type, j->unit->meta.job->type)) + !job_type_is_superset(j->type, j->unit->meta.job->type)) { + + dbus_set_error(e, BUS_ERROR_TRANSACTION_IS_DESTRUCTIVE, "Transaction is destructive."); return -EEXIST; + } } return 0; @@ -1016,13 +1010,13 @@ static void transaction_minimize_impact(Manager *m) { continue; if (stops_running_service) - log_debug("%s/%s would stop a running service.", j->unit->meta.id, job_type_to_string(j->type)); + log_info("%s/%s would stop a running service.", j->unit->meta.id, job_type_to_string(j->type)); if (changes_existing_job) - log_debug("%s/%s would change existing job.", j->unit->meta.id, job_type_to_string(j->type)); + log_info("%s/%s would change existing job.", j->unit->meta.id, job_type_to_string(j->type)); /* Ok, let's get rid of this */ - log_debug("Deleting %s/%s to minimize impact.", j->unit->meta.id, job_type_to_string(j->type)); + log_info("Deleting %s/%s to minimize impact.", j->unit->meta.id, job_type_to_string(j->type)); transaction_delete_job(m, j, true); again = true; @@ -1092,7 +1086,7 @@ rollback: return r; } -static int transaction_activate(Manager *m, JobMode mode) { +static int transaction_activate(Manager *m, JobMode mode, DBusError *e) { int r; unsigned generation = 1; @@ -1119,11 +1113,11 @@ static int transaction_activate(Manager *m, JobMode mode) { /* Fifth step: verify order makes sense and correct * cycles if necessary and possible */ - if ((r = transaction_verify_order(m, &generation)) >= 0) + if ((r = transaction_verify_order(m, &generation, e)) >= 0) break; if (r != -EAGAIN) { - log_debug("Requested transaction contains an unfixable cyclic ordering dependency: %s", strerror(-r)); + log_warning("Requested transaction contains an unfixable cyclic ordering dependency: %s", bus_error(e, r)); goto rollback; } @@ -1135,11 +1129,11 @@ static int transaction_activate(Manager *m, JobMode mode) { /* Sixth step: let's drop unmergeable entries if * necessary and possible, merge entries we can * merge */ - if ((r = transaction_merge_jobs(m)) >= 0) + if ((r = transaction_merge_jobs(m, e)) >= 0) break; if (r != -EAGAIN) { - log_debug("Requested transaction contains unmergable jobs: %s", strerror(-r)); + log_warning("Requested transaction contains unmergable jobs: %s", bus_error(e, r)); goto rollback; } @@ -1156,14 +1150,14 @@ static int transaction_activate(Manager *m, JobMode mode) { /* Ninth step: check whether we can actually apply this */ if (mode == JOB_FAIL) - if ((r = transaction_is_destructive(m)) < 0) { - log_debug("Requested transaction contradicts existing jobs: %s", strerror(-r)); + if ((r = transaction_is_destructive(m, e)) < 0) { + log_notice("Requested transaction contradicts existing jobs: %s", bus_error(e, r)); goto rollback; } /* Tenth step: apply changes */ if ((r = transaction_apply(m)) < 0) { - log_debug("Failed to apply transaction: %s", strerror(-r)); + log_warning("Failed to apply transaction: %s", strerror(-r)); goto rollback; } @@ -1250,7 +1244,7 @@ void manager_transaction_unlink_job(Manager *m, Job *j, bool delete_dependencies job_dependency_free(j->object_list); if (other && delete_dependencies) { - log_debug("Deleting job %s/%s as dependency of job %s/%s", + log_info("Deleting job %s/%s as dependency of job %s/%s", other->unit->meta.id, job_type_to_string(other->type), j->unit->meta.id, job_type_to_string(j->type)); transaction_delete_job(m, other, delete_dependencies); @@ -1265,6 +1259,7 @@ static int transaction_add_job_and_dependencies( Job *by, bool matters, bool override, + DBusError *e, Job **_ret) { Job *ret; Iterator i; @@ -1276,11 +1271,15 @@ static int transaction_add_job_and_dependencies( assert(type < _JOB_TYPE_MAX); assert(unit); - if (unit->meta.load_state != UNIT_LOADED) + if (unit->meta.load_state != UNIT_LOADED) { + dbus_set_error(e, BUS_ERROR_LOAD_FAILED, "Unit %s failed to load. See logs for details.", unit->meta.id); return -EINVAL; + } - if (!unit_job_is_applicable(unit, type)) + if (!unit_job_is_applicable(unit, type)) { + dbus_set_error(e, BUS_ERROR_JOB_TYPE_NOT_APPLICABLE, "Job type %s is not applicable for unit %s.", job_type_to_string(type), unit->meta.id); return -EBADR; + } /* First add the job. */ if (!(ret = transaction_add_one_job(m, type, unit, override, &is_new))) @@ -1294,33 +1293,33 @@ static int transaction_add_job_and_dependencies( /* Finally, recursively add in all dependencies. */ if (type == JOB_START || type == JOB_RELOAD_OR_START) { SET_FOREACH(dep, ret->unit->meta.dependencies[UNIT_REQUIRES], i) - if ((r = transaction_add_job_and_dependencies(m, JOB_START, dep, ret, true, override, NULL)) < 0 && r != -EBADR) + if ((r = transaction_add_job_and_dependencies(m, JOB_START, dep, ret, true, override, e, NULL)) < 0 && r != -EBADR) goto fail; SET_FOREACH(dep, ret->unit->meta.dependencies[UNIT_REQUIRES_OVERRIDABLE], i) - if ((r = transaction_add_job_and_dependencies(m, JOB_START, dep, ret, !override, override, NULL)) < 0 && r != -EBADR) + if ((r = transaction_add_job_and_dependencies(m, JOB_START, dep, ret, !override, override, e, NULL)) < 0 && r != -EBADR) log_warning("Cannot add dependency job for unit %s, ignoring: %s", dep->meta.id, strerror(-r)); SET_FOREACH(dep, ret->unit->meta.dependencies[UNIT_WANTS], i) - if ((r = transaction_add_job_and_dependencies(m, JOB_START, dep, ret, false, false, NULL)) < 0) + if ((r = transaction_add_job_and_dependencies(m, JOB_START, dep, ret, false, false, e, NULL)) < 0) log_warning("Cannot add dependency job for unit %s, ignoring: %s", dep->meta.id, strerror(-r)); SET_FOREACH(dep, ret->unit->meta.dependencies[UNIT_REQUISITE], i) - if ((r = transaction_add_job_and_dependencies(m, JOB_VERIFY_ACTIVE, dep, ret, true, override, NULL)) < 0 && r != -EBADR) + if ((r = transaction_add_job_and_dependencies(m, JOB_VERIFY_ACTIVE, dep, ret, true, override, e, NULL)) < 0 && r != -EBADR) goto fail; SET_FOREACH(dep, ret->unit->meta.dependencies[UNIT_REQUISITE_OVERRIDABLE], i) - if ((r = transaction_add_job_and_dependencies(m, JOB_VERIFY_ACTIVE, dep, ret, !override, override, NULL)) < 0 && r != -EBADR) + if ((r = transaction_add_job_and_dependencies(m, JOB_VERIFY_ACTIVE, dep, ret, !override, override, e, NULL)) < 0 && r != -EBADR) log_warning("Cannot add dependency job for unit %s, ignoring: %s", dep->meta.id, strerror(-r)); SET_FOREACH(dep, ret->unit->meta.dependencies[UNIT_CONFLICTS], i) - if ((r = transaction_add_job_and_dependencies(m, JOB_STOP, dep, ret, true, override, NULL)) < 0 && r != -EBADR) + if ((r = transaction_add_job_and_dependencies(m, JOB_STOP, dep, ret, true, override, e, NULL)) < 0 && r != -EBADR) goto fail; } else if (type == JOB_STOP || type == JOB_RESTART || type == JOB_TRY_RESTART) { SET_FOREACH(dep, ret->unit->meta.dependencies[UNIT_REQUIRED_BY], i) - if ((r = transaction_add_job_and_dependencies(m, type, dep, ret, true, override, NULL)) < 0 && r != -EBADR) + if ((r = transaction_add_job_and_dependencies(m, type, dep, ret, true, override, e, NULL)) < 0 && r != -EBADR) goto fail; } @@ -1354,21 +1353,21 @@ static int transaction_add_isolate_jobs(Manager *m) { continue; /* No need to stop inactive jobs */ - if (unit_active_state(u) == UNIT_INACTIVE) + if (UNIT_IS_INACTIVE_OR_MAINTENANCE(unit_active_state(u))) continue; /* Is there already something listed for this? */ if (hashmap_get(m->transaction_jobs, u)) continue; - if ((r = transaction_add_job_and_dependencies(m, JOB_STOP, u, NULL, true, false, NULL)) < 0) + if ((r = transaction_add_job_and_dependencies(m, JOB_STOP, u, NULL, true, false, NULL, NULL)) < 0) log_warning("Cannot add isolate job for unit %s, ignoring: %s", u->meta.id, strerror(-r)); } return 0; } -int manager_add_job(Manager *m, JobType type, Unit *unit, JobMode mode, bool override, Job **_ret) { +int manager_add_job(Manager *m, JobType type, Unit *unit, JobMode mode, bool override, DBusError *e, Job **_ret) { int r; Job *ret; @@ -1377,12 +1376,14 @@ int manager_add_job(Manager *m, JobType type, Unit *unit, JobMode mode, bool ove assert(unit); assert(mode < _JOB_MODE_MAX); - if (mode == JOB_ISOLATE && type != JOB_START) + if (mode == JOB_ISOLATE && type != JOB_START) { + dbus_set_error(e, BUS_ERROR_INVALID_JOB_MODE, "Isolate is only valid for start."); return -EINVAL; + } log_debug("Trying to enqueue job %s/%s", unit->meta.id, job_type_to_string(type)); - if ((r = transaction_add_job_and_dependencies(m, type, unit, NULL, true, override, &ret)) < 0) { + if ((r = transaction_add_job_and_dependencies(m, type, unit, NULL, true, override, e, &ret)) < 0) { transaction_abort(m); return r; } @@ -1393,7 +1394,7 @@ int manager_add_job(Manager *m, JobType type, Unit *unit, JobMode mode, bool ove return r; } - if ((r = transaction_activate(m, mode)) < 0) + if ((r = transaction_activate(m, mode, e)) < 0) return r; log_debug("Enqueued job %s/%s as %u", unit->meta.id, job_type_to_string(type), (unsigned) ret->id); @@ -1404,7 +1405,7 @@ int manager_add_job(Manager *m, JobType type, Unit *unit, JobMode mode, bool ove return 0; } -int manager_add_job_by_name(Manager *m, JobType type, const char *name, JobMode mode, bool override, Job **_ret) { +int manager_add_job_by_name(Manager *m, JobType type, const char *name, JobMode mode, bool override, DBusError *e, Job **_ret) { Unit *unit; int r; @@ -1413,10 +1414,10 @@ int manager_add_job_by_name(Manager *m, JobType type, const char *name, JobMode assert(name); assert(mode < _JOB_MODE_MAX); - if ((r = manager_load_unit(m, name, NULL, &unit)) < 0) + if ((r = manager_load_unit(m, name, NULL, NULL, &unit)) < 0) return r; - return manager_add_job(m, type, unit, mode, override, _ret); + return manager_add_job(m, type, unit, mode, override, e, _ret); } Job *manager_get_job(Manager *m, uint32_t id) { @@ -1450,7 +1451,7 @@ unsigned manager_dispatch_load_queue(Manager *m) { while ((meta = m->load_queue)) { assert(meta->in_load_queue); - unit_load(UNIT(meta)); + unit_load((Unit*) meta); n++; } @@ -1458,7 +1459,7 @@ unsigned manager_dispatch_load_queue(Manager *m) { return n; } -int manager_load_unit_prepare(Manager *m, const char *name, const char *path, Unit **_ret) { +int manager_load_unit_prepare(Manager *m, const char *name, const char *path, DBusError *e, Unit **_ret) { Unit *ret; int r; @@ -1468,14 +1469,18 @@ int manager_load_unit_prepare(Manager *m, const char *name, const char *path, Un /* This will prepare the unit for loading, but not actually * load anything from disk. */ - if (path && !is_path(path)) + if (path && !is_path(path)) { + dbus_set_error(e, BUS_ERROR_INVALID_PATH, "Path %s is not absolute.", path); return -EINVAL; + } if (!name) name = file_name_from_path(path); - if (!unit_name_is_valid(name)) + if (!unit_name_is_valid(name)) { + dbus_set_error(e, BUS_ERROR_INVALID_NAME, "Unit name %s is not valid.", name); return -EINVAL; + } if ((ret = manager_get_unit(m, name))) { *_ret = ret; @@ -1506,7 +1511,7 @@ int manager_load_unit_prepare(Manager *m, const char *name, const char *path, Un return 0; } -int manager_load_unit(Manager *m, const char *name, const char *path, Unit **_ret) { +int manager_load_unit(Manager *m, const char *name, const char *path, DBusError *e, Unit **_ret) { int r; assert(m); @@ -1514,7 +1519,7 @@ int manager_load_unit(Manager *m, const char *name, const char *path, Unit **_re /* This will load the service information files, but not actually * start any services or anything. */ - if ((r = manager_load_unit_prepare(m, name, path, _ret)) != 0) + if ((r = manager_load_unit_prepare(m, name, path, e, _ret)) != 0) return r; manager_dispatch_load_queue(m); @@ -1596,7 +1601,7 @@ unsigned manager_dispatch_dbus_queue(Manager *m) { while ((meta = m->dbus_unit_queue)) { assert(meta->in_dbus_queue); - bus_unit_send_change_signal(UNIT(meta)); + bus_unit_send_change_signal((Unit*) meta); n++; } @@ -1665,14 +1670,15 @@ static int manager_process_notify_fd(Manager *m) { continue; } - char_array_0(buf); + assert((size_t) n < sizeof(buf)); + buf[n] = 0; 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); + UNIT_VTABLE(u)->notify_message(u, ucred->pid, tags); strv_free(tags); } @@ -1711,7 +1717,7 @@ static int manager_dispatch_sigchld(Manager *m) { char *name = NULL; get_process_name(si.si_pid, &name); - log_debug("Got SIGCHLD for process %llu (%s)", (unsigned long long) si.si_pid, strna(name)); + log_debug("Got SIGCHLD for process %lu (%s)", (unsigned long) si.si_pid, strna(name)); free(name); } @@ -1737,11 +1743,11 @@ static int manager_dispatch_sigchld(Manager *m) { if (si.si_code != CLD_EXITED && si.si_code != CLD_KILLED && si.si_code != CLD_DUMPED) continue; - log_debug("Child %llu died (code=%s, status=%i/%s)", - (long long unsigned) si.si_pid, + log_debug("Child %lu died (code=%s, status=%i/%s)", + (long unsigned) si.si_pid, sigchld_code_to_string(si.si_code), si.si_status, - strna(si.si_code == CLD_EXITED ? exit_status_to_string(si.si_status) : strsignal(si.si_status))); + strna(si.si_code == CLD_EXITED ? exit_status_to_string(si.si_status) : signal_to_string(si.si_status))); if (!u) continue; @@ -1757,9 +1763,16 @@ static int manager_dispatch_sigchld(Manager *m) { static int manager_start_target(Manager *m, const char *name, JobMode mode) { int r; + DBusError error; + + dbus_error_init(&error); + + log_info("Activating special unit %s", name); - 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)); + if ((r = manager_add_job_by_name(m, JOB_START, name, mode, true, &error, NULL)) < 0) + log_error("Failed to enqueue %s job: %s", name, bus_error(&error, r)); + + dbus_error_free(&error); return r; } @@ -1783,6 +1796,8 @@ static int manager_process_signal_fd(Manager *m) { return -errno; } + log_debug("Received SIG%s", strna(signal_to_string(sfsi.ssi_signo))); + switch (sfsi.ssi_signo) { case SIGCHLD: @@ -1790,7 +1805,7 @@ static int manager_process_signal_fd(Manager *m) { break; case SIGTERM: - if (m->running_as == MANAGER_INIT) { + if (m->running_as == MANAGER_SYSTEM) { /* This is for compatibility with the * original sysvinit */ m->exit_code = MANAGER_REEXECUTE; @@ -1800,7 +1815,7 @@ static int manager_process_signal_fd(Manager *m) { /* Fall through */ case SIGINT: - if (m->running_as == MANAGER_INIT) { + if (m->running_as == MANAGER_SYSTEM) { manager_start_target(m, SPECIAL_CTRL_ALT_DEL_TARGET, JOB_REPLACE); break; } @@ -1814,14 +1829,14 @@ static int manager_process_signal_fd(Manager *m) { break; case SIGWINCH: - if (m->running_as == MANAGER_INIT) + if (m->running_as == MANAGER_SYSTEM) 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) + if (m->running_as == MANAGER_SYSTEM) manager_start_target(m, SPECIAL_SIGPWR_TARGET, JOB_REPLACE); /* This is a nop on non-init */ @@ -1834,8 +1849,7 @@ static int manager_process_signal_fd(Manager *m) { if (!u || UNIT_IS_ACTIVE_OR_RELOADING(unit_active_state(u))) { log_info("Trying to reconnect to bus..."); - bus_init_system(m); - bus_init_api(m); + bus_init(m); } if (!u || !UNIT_IS_ACTIVE_OR_ACTIVATING(unit_active_state(u))) { @@ -1890,11 +1904,11 @@ static int manager_process_signal_fd(Manager *m) { 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); + (sfsi.ssi_signo == 1 || sfsi.ssi_signo == 2) ? JOB_ISOLATE : JOB_REPLACE); break; } - log_info("Got unhandled signal <%s>.", strsignal(sfsi.ssi_signo)); + log_warning("Got unhandled signal <%s>.", strna(signal_to_string(sfsi.ssi_signo))); } } } @@ -2116,7 +2130,7 @@ void manager_write_utmp_reboot(Manager *m) { if (m->utmp_reboot_written) return; - if (m->running_as != MANAGER_INIT) + if (m->running_as != MANAGER_SYSTEM) return; if (!manager_utmp_good(m)) @@ -2142,7 +2156,7 @@ void manager_write_utmp_runlevel(Manager *m, Unit *u) { if (u->meta.type != UNIT_TARGET) return; - if (m->running_as != MANAGER_INIT) + if (m->running_as != MANAGER_SYSTEM) return; if (!manager_utmp_good(m)) @@ -2264,6 +2278,8 @@ int manager_deserialize(Manager *m, FILE *f, FDSet *fds) { log_debug("Deserializing state..."); + m->deserializing = true; + for (;;) { Unit *u; char name[UNIT_NAME_MAX+2]; @@ -2273,22 +2289,30 @@ int manager_deserialize(Manager *m, FILE *f, FDSet *fds) { if (feof(f)) break; - return -errno; + r = -errno; + goto finish; } char_array_0(name); - if ((r = manager_load_unit(m, strstrip(name), NULL, &u)) < 0) - return r; + if ((r = manager_load_unit(m, strstrip(name), NULL, NULL, &u)) < 0) + goto finish; if ((r = unit_deserialize(u, f, fds)) < 0) - return r; + goto finish; } - if (ferror(f)) - return -EIO; + if (ferror(f)) { + r = -EIO; + goto finish; + } - return 0; + r = 0; + +finish: + m->deserializing = false; + + return r; } int manager_reload(Manager *m) { @@ -2347,8 +2371,23 @@ finish: return r; } +bool manager_is_booting_or_shutting_down(Manager *m) { + Unit *u; + + assert(m); + + /* Is the initial job still around? */ + if (manager_get_job(m, 1)) + return true; + + /* Is there a job for the shutdown target? */ + if (((u = manager_get_unit(m, SPECIAL_SHUTDOWN_TARGET)))) + return !!u->meta.job; + + return false; +} + static const char* const manager_running_as_table[_MANAGER_RUNNING_AS_MAX] = { - [MANAGER_INIT] = "init", [MANAGER_SYSTEM] = "system", [MANAGER_SESSION] = "session" };