shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-13 13:17:43 +03:00
Code

service: don't read start priority from Kxx link

Browse Source
This commit is contained in:
Lennart Poettering 2010-04-24 05:02:25 +02:00
parent 1005d14f4a
commit 09cd1ab12e
1 changed files with 35 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
service.c
View File

@ -37,17 +37,31 @@
#define NEWLINES "\n\r" #define NEWLINES "\n\r"
#define LINE_MAX 4096 #define LINE_MAX 4096
static const char * const rcnd_table[] = {
"/rc0.d", SPECIAL_RUNLEVEL0_TARGET, typedef enum RunlevelType {
"/rc1.d", SPECIAL_RUNLEVEL1_TARGET, RUNLEVEL_UP,
"/rc2.d", SPECIAL_RUNLEVEL2_TARGET, RUNLEVEL_DOWN,
"/rc3.d", SPECIAL_RUNLEVEL3_TARGET, RUNLEVEL_BASIC
"/rc4.d", SPECIAL_RUNLEVEL4_TARGET, } RunlevelType;
"/rc5.d", SPECIAL_RUNLEVEL5_TARGET,
"/rc6.d", SPECIAL_RUNLEVEL6_TARGET, static const struct {
"/boot.d", SPECIAL_BASIC_TARGET const char *path;
const char *target;
const RunlevelType type;
} rcnd_table[] = {
{ "/rc0.d", SPECIAL_RUNLEVEL0_TARGET, RUNLEVEL_DOWN },
{ "/rc1.d", SPECIAL_RUNLEVEL1_TARGET, RUNLEVEL_UP },
{ "/rc2.d", SPECIAL_RUNLEVEL2_TARGET, RUNLEVEL_UP },
{ "/rc3.d", SPECIAL_RUNLEVEL3_TARGET, RUNLEVEL_UP },
{ "/rc4.d", SPECIAL_RUNLEVEL4_TARGET, RUNLEVEL_UP },
{ "/rc5.d", SPECIAL_RUNLEVEL5_TARGET, RUNLEVEL_UP },
{ "/rc6.d", SPECIAL_RUNLEVEL6_TARGET, RUNLEVEL_DOWN },
{ "/boot.d", SPECIAL_BASIC_TARGET, RUNLEVEL_BASIC },
}; };
#define RUNLEVELS_UP "12345"
#define RUNLEVELS_DOWN "06"
static const UnitActiveState state_translation_table[_SERVICE_STATE_MAX] = { static const UnitActiveState state_translation_table[_SERVICE_STATE_MAX] = {
[SERVICE_DEAD] = UNIT_INACTIVE, [SERVICE_DEAD] = UNIT_INACTIVE,
[SERVICE_START_PRE] = UNIT_ACTIVATING, [SERVICE_START_PRE] = UNIT_ACTIVATING,
@ -278,7 +292,6 @@ static int service_load_sysv_path(Service *s, const char *path) {
Unit *u; Unit *u;
unsigned line = 0; unsigned line = 0;
int r; int r;
bool normal_service;
enum { enum {
NORMAL, NORMAL,
DESCRIPTION, DESCRIPTION,
@ -580,9 +593,7 @@ static int service_load_sysv_path(Service *s, const char *path) {
if ((r = sysv_exec_commands(s)) < 0) if ((r = sysv_exec_commands(s)) < 0)
goto finish; goto finish;
normal_service = !s->sysv_runlevels || chars_intersect("12345", s->sysv_runlevels); if (!s->sysv_runlevels || chars_intersect(RUNLEVELS_UP, s->sysv_runlevels)) {
if (normal_service) {
/* If there a runlevels configured for this service /* If there a runlevels configured for this service
* but none of the standard ones, then we assume this * but none of the standard ones, then we assume this
* is some special kind of service (which might be * is some special kind of service (which might be
@ -592,16 +603,15 @@ static int service_load_sysv_path(Service *s, const char *path) {
if ((r = unit_add_dependency_by_name(u, UNIT_REQUIRES, SPECIAL_BASIC_TARGET, NULL, true)) < 0 || if ((r = unit_add_dependency_by_name(u, UNIT_REQUIRES, SPECIAL_BASIC_TARGET, NULL, true)) < 0 ||
(r = unit_add_dependency_by_name(u, UNIT_AFTER, SPECIAL_BASIC_TARGET, NULL, true)) < 0) (r = unit_add_dependency_by_name(u, UNIT_AFTER, SPECIAL_BASIC_TARGET, NULL, true)) < 0)
goto finish; goto finish;
}
} else
/* Don't timeout special services during boot (like fsck) */
s->timeout_usec = 0;
/* Special setting for all SysV services */ /* Special setting for all SysV services */
s->valid_no_process = true; s->valid_no_process = true;
s->kill_mode = KILL_PROCESS_GROUP; s->kill_mode = KILL_PROCESS_GROUP;
/* Don't timeout special services during boot (like fsck) */
if (s->sysv_runlevels && !normal_service)
s->timeout_usec = 0;
u->meta.load_state = UNIT_LOADED; u->meta.load_state = UNIT_LOADED;
r = 0; r = 0;
@ -2123,12 +2133,12 @@ static int service_enumerate(Manager *m) {
assert(m); assert(m);
STRV_FOREACH(p, m->sysvrcnd_path) STRV_FOREACH(p, m->sysvrcnd_path)
for (i = 0; i < ELEMENTSOF(rcnd_table); i += 2) { for (i = 0; i < ELEMENTSOF(rcnd_table); i ++) {
struct dirent *de; struct dirent *de;
free(path); free(path);
path = NULL; path = NULL;
if (asprintf(&path, "%s/%s", *p, rcnd_table[i]) < 0) { if (asprintf(&path, "%s/%s", *p, rcnd_table[i].path) < 0) {
r = -ENOMEM; r = -ENOMEM;
goto finish; goto finish;
} }
@ -2164,7 +2174,7 @@ static int service_enumerate(Manager *m) {
free(fpath); free(fpath);
fpath = NULL; fpath = NULL;
if (asprintf(&fpath, "%s/%s/%s", *p, rcnd_table[i], de->d_name) < 0) { if (asprintf(&fpath, "%s/%s/%s", *p, rcnd_table[i].path, de->d_name) < 0) {
r = -ENOMEM; r = -ENOMEM;
goto finish; goto finish;
} }
@ -2187,7 +2197,8 @@ static int service_enumerate(Manager *m) {
if ((r = manager_load_unit_prepare(m, name, NULL, &service)) < 0) if ((r = manager_load_unit_prepare(m, name, NULL, &service)) < 0)
goto finish; goto finish;
if (de->d_name[0] == 'S') if (de->d_name[0] == 'S' &&
(rcnd_table[i].type == RUNLEVEL_UP || rcnd_table[i].type == RUNLEVEL_BASIC))
SERVICE(service)->sysv_start_priority = a*10 + b; SERVICE(service)->sysv_start_priority = a*10 + b;
manager_dispatch_load_queue(m); manager_dispatch_load_queue(m);
@ -2196,7 +2207,7 @@ static int service_enumerate(Manager *m) {
if (de->d_name[0] == 'S') { if (de->d_name[0] == 'S') {
Unit *runlevel_target; Unit *runlevel_target;
if ((r = manager_load_unit(m, rcnd_table[i+1], NULL, &runlevel_target)) < 0) if ((r = manager_load_unit(m, rcnd_table[i].target, NULL, &runlevel_target)) < 0)
goto finish; goto finish;
if ((r = unit_add_dependency(runlevel_target, UNIT_WANTS, service, true)) < 0) if ((r = unit_add_dependency(runlevel_target, UNIT_WANTS, service, true)) < 0)
@ -2205,10 +2216,7 @@ static int service_enumerate(Manager *m) {
if ((r = unit_add_dependency(service, UNIT_BEFORE, runlevel_target, true)) < 0) if ((r = unit_add_dependency(service, UNIT_BEFORE, runlevel_target, true)) < 0)
goto finish; goto finish;
} else if (de->d_name[0] == 'K' && } else if (de->d_name[0] == 'K' && rcnd_table[i].type == RUNLEVEL_DOWN) {
(streq(rcnd_table[i+1], SPECIAL_RUNLEVEL0_TARGET) ||
streq(rcnd_table[i+1], SPECIAL_RUNLEVEL6_TARGET))) {
Unit *shutdown_target; Unit *shutdown_target;
/* We honour K links only for /* We honour K links only for