X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=service.c;h=3d840cbd92f9c3c8a1cfa53d9e8de01b2f41edb2;hb=70123e68a04016efca9266fc22dd05a0a7fd2d51;hp=fda553d22580d12235529a252b13eb9b57027c4e;hpb=f278026d21e2ded46f7f91152d60842525e74956;p=elogind.git diff --git a/service.c b/service.c index fda553d22..3d840cbd9 100644 --- a/service.c +++ b/service.c @@ -36,16 +36,16 @@ #define LINE_MAX 4096 static const char * const rcnd_table[] = { - "../rc0.d", SPECIAL_RUNLEVEL0_TARGET, - "../rc1.d", SPECIAL_RUNLEVEL1_TARGET, - "../rc2.d", SPECIAL_RUNLEVEL2_TARGET, - "../rc3.d", SPECIAL_RUNLEVEL3_TARGET, - "../rc4.d", SPECIAL_RUNLEVEL4_TARGET, - "../rc5.d", SPECIAL_RUNLEVEL5_TARGET, - "../rc6.d", SPECIAL_RUNLEVEL6_TARGET + "/rc0.d", SPECIAL_RUNLEVEL0_TARGET, + "/rc1.d", SPECIAL_RUNLEVEL1_TARGET, + "/rc2.d", SPECIAL_RUNLEVEL2_TARGET, + "/rc3.d", SPECIAL_RUNLEVEL3_TARGET, + "/rc4.d", SPECIAL_RUNLEVEL4_TARGET, + "/rc5.d", SPECIAL_RUNLEVEL5_TARGET, + "/rc6.d", SPECIAL_RUNLEVEL6_TARGET, + "/boot.d", SPECIAL_BASIC_TARGET }; - static const UnitActiveState state_translation_table[_SERVICE_STATE_MAX] = { [SERVICE_DEAD] = UNIT_INACTIVE, [SERVICE_START_PRE] = UNIT_ACTIVATING, @@ -74,6 +74,9 @@ static void service_done(Unit *u) { free(s->sysv_path); s->sysv_path = NULL; + free(s->sysv_runlevels); + s->sysv_runlevels = NULL; + exec_context_done(&s->exec_context); exec_command_free_array(s->exec_command, _SERVICE_EXEC_MAX); s->control_command = NULL; @@ -218,7 +221,7 @@ static int priority_from_rcd(Service *s, const char *init_script) { char **p; unsigned i; - STRV_FOREACH(p, UNIT(s)->meta.manager->sysvinit_path) + STRV_FOREACH(p, UNIT(s)->meta.manager->sysvrcnd_path) for (i = 0; i < ELEMENTSOF(rcnd_table); i += 2) { char *path; DIR *d; @@ -344,22 +347,38 @@ static int service_load_sysv_path(Service *s, const char *path, UnitLoadState *n if (startswith(t, "chkconfig:")) { int start_priority; + char runlevels[16], *k; state = NORMAL; - if (sscanf(t+10, "%*15s %i %*i", - &start_priority) != 1) { + if (sscanf(t+10, "%15s %i %*i", + runlevels, + &start_priority) != 2) { log_warning("[%s:%u] Failed to parse chkconfig line. Ignoring.", path, line); continue; } - if (start_priority < 0 || start_priority > 99) { + if (start_priority < 0 || start_priority > 99) log_warning("[%s:%u] Start priority out of range. Ignoring.", path, line); - continue; + else + s->sysv_start_priority = start_priority; + + char_array_0(runlevels); + k = delete_chars(runlevels, WHITESPACE "-"); + + if (k[0]) { + char *d; + + if (!(d = strdup(k))) { + r = -ENOMEM; + goto finish; + } + + free(s->sysv_runlevels); + s->sysv_runlevels = d; } - s->sysv_start_priority = start_priority; } else if (startswith(t, "description:")) { @@ -484,20 +503,28 @@ static int service_load_sysv_path(Service *s, const char *path, UnitLoadState *n if (r == 0) continue; - if (!(r = unit_add_dependency_by_name(u, UNIT_AFTER, m)) < 0) { - free(m); - goto finish; - } - - r = unit_add_dependency_by_name( - u, - startswith(t, "Required-Start:") ? UNIT_REQUIRES : UNIT_WANTS, - m); + r = unit_add_dependency_by_name(u, UNIT_AFTER, m); free(m); if (r < 0) goto finish; } + } else if (startswith(t, "Default-Start:")) { + char *k, *d; + + state = LSB; + + k = delete_chars(t+14, WHITESPACE "-"); + + if (k[0] != 0) { + if (!(d = strdup(k))) { + r = -ENOMEM; + goto finish; + } + + free(s->sysv_runlevels); + s->sysv_runlevels = d; + } } else if (startswith(t, "Description:")) { char *d; @@ -512,7 +539,8 @@ static int service_load_sysv_path(Service *s, const char *path, UnitLoadState *n free(u->meta.description); u->meta.description = d; - } else if (startswith(t, "Short-Description:") && !u->meta.description) { + } else if (startswith(t, "Short-Description:") && + !u->meta.description) { char *d; /* We use the short description only @@ -525,7 +553,6 @@ static int service_load_sysv_path(Service *s, const char *path, UnitLoadState *n goto finish; } - free(u->meta.description); u->meta.description = d; } else if (state == LSB_DESCRIPTION) { @@ -565,9 +592,17 @@ static int service_load_sysv_path(Service *s, const char *path, UnitLoadState *n if ((r = sysv_exec_commands(s)) < 0) goto finish; - if ((r = unit_add_dependency_by_name(u, UNIT_REQUIRES, SPECIAL_SYSINIT_SERVICE)) < 0 || - (r = unit_add_dependency_by_name(u, UNIT_AFTER, SPECIAL_SYSINIT_SERVICE)) < 0) - goto finish; + if (!s->sysv_runlevels || chars_intersect("12345", s->sysv_runlevels)) { + /* If there a runlevels configured for this service + * but none of the standard ones, then we assume this + * is some special kind of service (which might be + * needed for early boot) and don't create any links + * to it. */ + + if ((r = unit_add_dependency_by_name(u, UNIT_REQUIRES, SPECIAL_BASIC_TARGET)) < 0 || + (r = unit_add_dependency_by_name(u, UNIT_AFTER, SPECIAL_BASIC_TARGET)) < 0) + goto finish; + } *new_state = UNIT_LOADED; r = 0; @@ -665,8 +700,12 @@ static int service_init(Unit *u, UnitLoadState *new_state) { s->sysv_start_priority = -1; s->permissions_start_only = false; s->root_directory_start_only = false; - + s->valid_no_process = false; + s->kill_mode = 0; s->sysv_has_lsb = false; + s->main_pid = s->control_pid = 0; + s->main_pid_known = false; + s->failure = false; RATELIMIT_INIT(s->ratelimit, 10*USEC_PER_SEC, 5); @@ -720,13 +759,25 @@ static void service_dump(Unit *u, FILE *f, const char *prefix) { "%sPermissionsStartOnly: %s\n" "%sRootDirectoryStartOnly: %s\n" "%sValidNoProcess: %s\n" + "%sKillMode: %s\n" "%sType: %s\n", prefix, service_state_to_string(s->state), prefix, yes_no(s->permissions_start_only), prefix, yes_no(s->root_directory_start_only), prefix, yes_no(s->valid_no_process), + prefix, kill_mode_to_string(s->kill_mode), prefix, service_type_to_string(s->type)); + if (s->control_pid > 0) + fprintf(f, + "%sControl PID: %llu\n", + prefix, (unsigned long long) s->control_pid); + + if (s->main_pid > 0) + fprintf(f, + "%sMain PID: %llu\n", + prefix, (unsigned long long) s->main_pid); + if (s->pid_file) fprintf(f, "%sPIDFile: %s\n", @@ -757,6 +808,9 @@ static void service_dump(Unit *u, FILE *f, const char *prefix) { "%sSysVStartPriority: %i\n", prefix, s->sysv_start_priority); + if (s->sysv_runlevels) + fprintf(f, "%sSysVRunLevels: %s\n", + prefix, s->sysv_runlevels); free(p2); } @@ -924,6 +978,9 @@ static void service_set_state(Service *s, ServiceState state) { state == SERVICE_AUTO_RESTART) service_notify_sockets(s); + if (old_state == state) + return; + log_debug("%s changed %s → %s", unit_id(UNIT(s)), service_state_to_string(old_state), service_state_to_string(state)); unit_notify(UNIT(s), state_translation_table[old_state], state_translation_table[state]); @@ -1116,23 +1173,34 @@ static void service_enter_signal(Service *s, ServiceState state, bool success) { sig = (state == SERVICE_STOP_SIGTERM || state == SERVICE_FINAL_SIGTERM) ? SIGTERM : SIGKILL; - r = 0; - if (s->main_pid > 0) { - if (kill(s->main_pid, sig) < 0 && errno != ESRCH) - r = -errno; - else - sent = true; - } + if (s->kill_mode == KILL_CONTROL_GROUP) { - if (s->control_pid > 0) { - if (kill(s->control_pid, sig) < 0 && errno != ESRCH) - r = -errno; - else + if ((r = cgroup_bonding_kill_list(UNIT(s)->meta.cgroup_bondings, sig)) < 0) { + if (r != -EAGAIN && r != -ESRCH) + goto fail; + } else sent = true; } - if (r < 0) - goto fail; + if (!sent) { + r = 0; + if (s->main_pid > 0) { + if (kill(s->kill_mode == KILL_PROCESS ? s->main_pid : -s->main_pid, sig) < 0 && errno != ESRCH) + r = -errno; + else + sent = true; + } + + if (s->control_pid > 0) { + if (kill(s->kill_mode == KILL_PROCESS ? s->control_pid : -s->control_pid, sig) < 0 && errno != ESRCH) + r = -errno; + else + sent = true; + } + + if (r < 0) + goto fail; + } } service_set_state(s, state); @@ -1500,7 +1568,7 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) { s->exec_command[SERVICE_EXEC_START]->exec_status = s->main_exec_status; } - log_debug("%s: main process exited, code=%s status=%i", unit_id(u), sigchld_code_to_string(code), status); + log_debug("%s: main process exited, code=%s, status=%i", unit_id(u), sigchld_code_to_string(code), status); /* The service exited, so the service is officially * gone. */ @@ -1751,7 +1819,7 @@ static int service_enumerate(Manager *m) { assert(m); - STRV_FOREACH(p, m->sysvinit_path) + STRV_FOREACH(p, m->sysvrcnd_path) for (i = 0; i < ELEMENTSOF(rcnd_table); i += 2) { struct dirent *de;