[SERVICE_START_POST] = UNIT_ACTIVATING,
[SERVICE_RUNNING] = UNIT_ACTIVE,
[SERVICE_EXITED] = UNIT_ACTIVE,
- [SERVICE_RELOAD] = UNIT_ACTIVE_RELOADING,
+ [SERVICE_RELOAD] = UNIT_RELOADING,
[SERVICE_STOP] = UNIT_DEACTIVATING,
[SERVICE_STOP_SIGTERM] = UNIT_DEACTIVATING,
[SERVICE_STOP_SIGKILL] = UNIT_DEACTIVATING,
[SERVICE_STOP_POST] = UNIT_DEACTIVATING,
[SERVICE_FINAL_SIGTERM] = UNIT_DEACTIVATING,
[SERVICE_FINAL_SIGKILL] = UNIT_DEACTIVATING,
- [SERVICE_MAINTENANCE] = UNIT_INACTIVE,
- [SERVICE_AUTO_RESTART] = UNIT_ACTIVATING,
+ [SERVICE_MAINTENANCE] = UNIT_MAINTENANCE,
+ [SERVICE_AUTO_RESTART] = UNIT_ACTIVATING
};
static void service_init(Unit *u) {
if (unit_name_to_type(m) == UNIT_SERVICE)
r = unit_add_name(u, m);
- else {
- if ((r = unit_add_dependency_by_name_inverse(u, UNIT_REQUIRES, m, NULL, true)) >= 0)
- r = unit_add_dependency_by_name(u, UNIT_BEFORE, m, NULL, true);
- }
+ else
+ r = unit_add_two_dependencies_by_name_inverse(u, UNIT_AFTER, UNIT_REQUIRES, m, NULL, true);
free(m);
service = unit_follow_merge(service);
if (de->d_name[0] == 'S') {
- Unit *runlevel_target;
-
- if ((r = manager_load_unit(m, rcnd_table[i].target, NULL, &runlevel_target)) < 0)
- goto finish;
- if ((r = unit_add_dependency(runlevel_target, UNIT_WANTS, service, true)) < 0)
- goto finish;
-
- if ((r = unit_add_dependency(service, UNIT_BEFORE, runlevel_target, true)) < 0)
+ if ((r = unit_add_two_dependencies_by_name_inverse(service, UNIT_AFTER, UNIT_WANTS, rcnd_table[i].target, NULL, true)) < 0)
goto finish;
} else if (de->d_name[0] == 'K' &&
(rcnd_table[i].type == RUNLEVEL_DOWN ||
rcnd_table[i].type == RUNLEVEL_SYSINIT)) {
- Unit *shutdown_target;
/* We honour K links only for
* halt/reboot. For the normal
* too to the shutdown
* target.*/
- if ((r = manager_load_unit(m, SPECIAL_SHUTDOWN_TARGET, NULL, &shutdown_target)) < 0)
- goto finish;
-
- if ((r = unit_add_dependency(service, UNIT_CONFLICTS, shutdown_target, true)) < 0)
- goto finish;
-
- if ((r = unit_add_dependency(service, UNIT_BEFORE, shutdown_target, true)) < 0)
+ if ((r = unit_add_two_dependencies_by_name_inverse(service, UNIT_AFTER, UNIT_CONFLICTS, SPECIAL_SHUTDOWN_TARGET, NULL, true)) < 0)
goto finish;
}
}
DEFINE_STRING_TABLE_LOOKUP(service_restart, ServiceRestart);
static const char* const service_type_table[_SERVICE_TYPE_MAX] = {
- [SERVICE_FORKING] = "forking",
[SERVICE_SIMPLE] = "simple",
+ [SERVICE_FORKING] = "forking",
[SERVICE_FINISH] = "finish",
[SERVICE_DBUS] = "dbus",
[SERVICE_NOTIFY] = "notify"