return 0;
}
-static int priority_from_rcd(Service *s, const char *init_script) {
- char **p;
- unsigned i;
-
- STRV_FOREACH(p, UNIT(s)->meta.manager->sysvrcnd_path)
- for (i = 0; i < ELEMENTSOF(rcnd_table); i += 2) {
- char *path;
- DIR *d;
- struct dirent *de;
-
- if (asprintf(&path, "%s/%s", *p, rcnd_table[i]) < 0)
- return -ENOMEM;
-
- d = opendir(path);
- free(path);
-
- if (!d) {
- if (errno != ENOENT)
- log_warning("opendir() failed on %s: %s", path, strerror(errno));
-
- continue;
- }
-
- while ((de = readdir(d))) {
- int a, b;
-
- if (ignore_file(de->d_name))
- continue;
-
- if (de->d_name[0] != 'S')
- continue;
-
- if (strlen(de->d_name) < 4)
- continue;
-
- if (!streq(de->d_name + 3, init_script))
- continue;
-
- /* Yay, we found it! Now decode the priority */
-
- a = undecchar(de->d_name[1]);
- b = undecchar(de->d_name[2]);
-
- if (a < 0 || b < 0)
- continue;
-
- s->sysv_start_priority = a*10 + b;
-
- log_debug("Determined priority %i from link farm for %s", s->sysv_start_priority, UNIT(s)->meta.id);
-
- closedir(d);
- return 0;
- }
-
- closedir(d);
- }
-
- return 0;
-}
-
static int service_load_sysv_path(Service *s, const char *path) {
FILE *f;
Unit *u;
unsigned line = 0;
int r;
+ bool normal_service;
enum {
NORMAL,
DESCRIPTION,
if (start_priority < 0 || start_priority > 99)
log_warning("[%s:%u] Start priority out of range. Ignoring.", path, line);
- else
+ else if (s->sysv_start_priority < 0)
s->sysv_start_priority = start_priority;
char_array_0(runlevels);
s->sysv_runlevels = d;
}
-
} else if (startswith(t, "description:")) {
size_t k = strlen(t);
* a priority for *all* init scripts here, since they are
* needed as soon as at least one non-LSB script is used. */
- if (s->sysv_start_priority < 0) {
- log_debug("%s has no chkconfig header, trying to determine SysV priority from link farm.", u->meta.id);
-
- if ((r = priority_from_rcd(s, file_name_from_path(path))) < 0)
- goto finish;
-
- if (s->sysv_start_priority < 0)
- log_warning("%s has neither a chkconfig header nor a directory link, cannot order unit!", u->meta.id);
- }
+ if (s->sysv_start_priority < 0)
+ log_warning("%s has neither a chkconfig header nor a directory link, cannot order unit!", u->meta.id);
if ((r = sysv_exec_commands(s)) < 0)
goto finish;
- if (!s->sysv_runlevels || chars_intersect("12345", s->sysv_runlevels)) {
+ normal_service = !s->sysv_runlevels || chars_intersect("12345", s->sysv_runlevels);
+
+ if (normal_service) {
/* 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
/* Special setting for all SysV services */
s->valid_no_process = true;
+ s->kill_mode = KILL_PROCESS_GROUP;
/* Don't timeout special services during boot (like fsck) */
- if (s->sysv_runlevels && !chars_intersect("12345", s->sysv_runlevels))
- s->timeout_usec = -1;
+ if (s->sysv_runlevels && !normal_service)
+ s->timeout_usec = 0;
u->meta.load_state = UNIT_LOADED;
r = 0;
}
}
- if (sent) {
+ if (sent && (s->main_pid > 0 || s->control_pid > 0)) {
if (s->timeout_usec > 0)
if ((r = unit_watch_timer(UNIT(s), s->timeout_usec, &s->timer_watch)) < 0)
goto fail;
* commands attached here, we will start from the first one
* again */
if (s->control_command_id >= 0)
- unit_serialize_item(u, f, "control-command", mount_exec_command_to_string(s->control_command_id));
+ unit_serialize_item(u, f, "control-command", service_exec_command_to_string(s->control_command_id));
if (s->socket_fd >= 0) {
int copy;
while ((de = readdir(d))) {
Unit *service;
+ int a, b;
if (ignore_file(de->d_name))
continue;
if (strlen(de->d_name) < 4)
continue;
+ a = undecchar(de->d_name[1]);
+ b = undecchar(de->d_name[2]);
+
+ if (a < 0 || b < 0)
+ continue;
+
free(fpath);
fpath = NULL;
if (asprintf(&fpath, "%s/%s/%s", *p, rcnd_table[i], de->d_name) < 0) {
goto finish;
}
- if ((r = manager_load_unit(m, name, NULL, &service)) < 0)
+ if ((r = manager_load_unit_prepare(m, name, NULL, &service)) < 0)
goto finish;
+ if (de->d_name[0] == 'S')
+ SERVICE(service)->sysv_start_priority = a*10 + b;
+
+ manager_dispatch_load_queue(m);
+ service = unit_follow_merge(service);
+
if (de->d_name[0] == 'S') {
Unit *runlevel_target;
if ((r = unit_add_dependency(runlevel_target, UNIT_WANTS, service, true)) < 0)
goto finish;
- if ((r = unit_add_dependency(runlevel_target, UNIT_AFTER, service, true)) < 0)
+ if ((r = unit_add_dependency(service, UNIT_BEFORE, runlevel_target, true)) < 0)
goto finish;
} else if (de->d_name[0] == 'K' &&
if ((r = manager_load_unit(m, SPECIAL_SHUTDOWN_TARGET, NULL, &shutdown_target)) < 0)
goto finish;
- if ((r = unit_add_dependency(shutdown_target, UNIT_CONFLICTS, service, true)) < 0)
+ if ((r = unit_add_dependency(service, UNIT_CONFLICTS, shutdown_target, true)) < 0)
goto finish;
- if ((r = unit_add_dependency(shutdown_target, UNIT_BEFORE, service, true)) < 0)
+ if ((r = unit_add_dependency(service, UNIT_BEFORE, shutdown_target, true)) < 0)
goto finish;
}
}
~ianmdlvl / elogind.git / blobdiff