return -EBADR;
state = unit_active_state(u);
- if (unit_active_state(u) == UNIT_ACTIVE_RELOADING)
+ if (unit_active_state(u) == UNIT_RELOADING)
return -EALREADY;
if (unit_active_state(u) != UNIT_ACTIVE)
if (u->meta.job->state == JOB_RUNNING) {
if (ns == UNIT_ACTIVE)
job_finish_and_invalidate(u->meta.job, true);
- else if (ns != UNIT_ACTIVATING && ns != UNIT_ACTIVE_RELOADING) {
+ else if (ns != UNIT_ACTIVATING && ns != UNIT_RELOADING) {
unexpected = true;
job_finish_and_invalidate(u->meta.job, false);
}
if (ns == UNIT_INACTIVE)
job_finish_and_invalidate(u->meta.job, true);
- else if (ns == UNIT_INACTIVE_MAINTENANCE)
+ else if (ns == UNIT_MAINTENANCE)
job_finish_and_invalidate(u->meta.job, false);
else if (u->meta.job->state == JOB_RUNNING && ns != UNIT_DEACTIVATING) {
unexpected = true;
static const char* const unit_active_state_table[_UNIT_ACTIVE_STATE_MAX] = {
[UNIT_ACTIVE] = "active",
- [UNIT_ACTIVE_RELOADING] = "active-reloading",
+ [UNIT_RELOADING] = "reloading",
[UNIT_INACTIVE] = "inactive",
- [UNIT_INACTIVE_MAINTENANCE] = "inactive-maintenance",
+ [UNIT_MAINTENANCE] = "maintenance",
[UNIT_ACTIVATING] = "activating",
[UNIT_DEACTIVATING] = "deactivating"
};