#include "unit-name.h"
#include "path.h"
#include "dbus-path.h"
+#include "special.h"
+#include "bus-errors.h"
static const UnitActiveState state_translation_table[_PATH_STATE_MAX] = {
[PATH_DEAD] = UNIT_INACTIVE,
[PATH_WAITING] = UNIT_ACTIVE,
[PATH_RUNNING] = UNIT_ACTIVE,
- [PATH_MAINTAINANCE] = UNIT_INACTIVE
+ [PATH_MAINTENANCE] = UNIT_MAINTENANCE
};
static void path_done(Unit *u) {
if (!path_startswith(s->path, m->where))
continue;
- if ((r = unit_add_dependency(UNIT(m), UNIT_BEFORE, UNIT(p), true)) < 0)
- return r;
-
- if ((r = unit_add_dependency(UNIT(p), UNIT_REQUIRES, UNIT(m), true)) < 0)
+ if ((r = unit_add_two_dependencies(UNIT(p), UNIT_AFTER, UNIT_REQUIRES, UNIT(m), true)) < 0)
return r;
}
static int path_verify(Path *p) {
assert(p);
- if (UNIT(p)->meta.load_state != UNIT_LOADED)
+ if (p->meta.load_state != UNIT_LOADED)
return 0;
if (!p->specs) {
if ((r = path_add_mount_links(p)) < 0)
return r;
+
+ /* Path units shouldn't stay around on shutdown */
+ if (p->meta.default_dependencies)
+ if ((r = unit_add_two_dependencies_by_name(u, UNIT_BEFORE, UNIT_CONFLICTS, SPECIAL_SHUTDOWN_TARGET, NULL, true)) < 0)
+ return r;
}
return path_verify(p);
if (!success)
p->failure = true;
- path_set_state(p, p->failure ? PATH_MAINTAINANCE : PATH_DEAD);
+ path_set_state(p, p->failure ? PATH_MAINTENANCE : PATH_DEAD);
}
static void path_enter_running(Path *p) {
int r;
+ DBusError error;
+
assert(p);
+ dbus_error_init(&error);
- if ((r = manager_add_job(UNIT(p)->meta.manager, JOB_START, p->unit, JOB_REPLACE, true, NULL)) < 0)
+ if ((r = manager_add_job(p->meta.manager, JOB_START, p->unit, JOB_REPLACE, true, &error, NULL)) < 0)
goto fail;
path_set_state(p, PATH_RUNNING);
return;
fail:
- log_warning("%s failed to queue unit startup job: %s", p->meta.id, strerror(-r));
+ log_warning("%s failed to queue unit startup job: %s", p->meta.id, bus_error(&error, r));
path_enter_dead(p, false);
+
+ dbus_error_free(&error);
}
Path *p = PATH(u);
assert(p);
- assert(p->state == PATH_DEAD || p->state == PATH_MAINTAINANCE);
+ assert(p->state == PATH_DEAD || p->state == PATH_MAINTENANCE);
if (p->unit->meta.load_state != UNIT_LOADED)
return -ENOENT;
[PATH_DEAD] = "dead",
[PATH_WAITING] = "waiting",
[PATH_RUNNING] = "running",
- [PATH_MAINTAINANCE] = "maintainance"
+ [PATH_MAINTENANCE] = "maintenance"
};
DEFINE_STRING_TABLE_LOOKUP(path_state, PathState);