X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=service.c;h=8018bd847cbfe6b7c7c2f65f7c73876b07588d9f;hp=b564c986b96dc2d872a565c450119903383baffd;hb=24e61ac49db6add10ffa448f42202245fb883b96;hpb=94f043472a5af62dc9cd5767e89ba33872212d5e
diff --git a/service.c b/service.c
index b564c986b..8018bd847 100644
--- a/service.c
+++ b/service.c
@@ -1,13 +1,39 @@
/*-*- Mode: C; c-basic-offset: 8 -*-*/
+/***
+ This file is part of systemd.
+
+ Copyright 2010 Lennart Poettering
+
+ systemd is free software; you can redistribute it and/or modify it
+ under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ systemd is distributed in the hope that it will be useful, but
+ WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with systemd; If not, see .
+***/
+
#include
#include
+#include
+#include
#include "unit.h"
#include "service.h"
#include "load-fragment.h"
#include "load-dropin.h"
#include "log.h"
+#include "strv.h"
+
+#define COMMENTS "#;\n"
+#define NEWLINES "\n\r"
+#define LINE_MAX 4096
static const UnitActiveState state_translation_table[_SERVICE_STATE_MAX] = {
[SERVICE_DEAD] = UNIT_INACTIVE,
@@ -34,6 +60,9 @@ static void service_done(Unit *u) {
free(s->pid_file);
s->pid_file = NULL;
+ free(s->sysv_path);
+ s->sysv_path = NULL;
+
exec_context_done(&s->exec_context);
exec_command_free_array(s->exec_command, _SERVICE_EXEC_MAX);
s->control_command = NULL;
@@ -53,13 +82,463 @@ static void service_done(Unit *u) {
unit_unwatch_timer(u, &s->timer_watch);
}
+static int sysv_translate_name(const char *name, char **_r) {
+
+ static const char * const table[] = {
+ "$local_fs", SPECIAL_LOCAL_FS_TARGET,
+ "$network", SPECIAL_NETWORK_TARGET,
+ "$named", SPECIAL_NSS_LOOKUP_TARGET,
+ "$portmap", SPECIAL_RPCBIND_TARGET,
+ "$remote_fs", SPECIAL_REMOTE_FS_TARGET,
+ "$syslog", SPECIAL_SYSLOG_TARGET,
+ "$time", SPECIAL_RTC_SET_TARGET
+ };
+
+ unsigned i;
+ char *r;
+
+ for (i = 0; i < ELEMENTSOF(table); i += 2)
+ if (streq(table[i], name)) {
+ if (!(r = strdup(table[i+1])))
+ return -ENOMEM;
+
+ goto finish;
+ }
+
+ if (*name == '$')
+ return 0;
+
+ if (asprintf(&r, "%s.service", name) < 0)
+ return -ENOMEM;
+
+finish:
+
+ if (_r)
+ *_r = r;
+
+ return 1;
+}
+
+static int sysv_chkconfig_order(Service *s) {
+ Meta *other;
+ int r;
+
+ assert(s);
+
+ if (s->sysv_start_priority < 0)
+ return 0;
+
+ /* If no LSB header is found we try to order init scripts via
+ * the start priority of the chkconfig header. */
+
+ LIST_FOREACH(units_per_type, other, UNIT(s)->meta.manager->units_per_type[UNIT_SERVICE]) {
+ Service *t;
+ UnitDependency d;
+
+ t = (Service*) other;
+
+ if (s == t)
+ continue;
+
+ if (t->sysv_start_priority < 0)
+ continue;
+
+ if (t->sysv_start_priority < s->sysv_start_priority)
+ d = UNIT_AFTER;
+ else if (t->sysv_start_priority > s->sysv_start_priority)
+ d = UNIT_BEFORE;
+ else
+ continue;
+
+ /* FIXME: Maybe we should compare the name here lexicographically? */
+
+ if (!(r = unit_add_dependency(UNIT(s), d, UNIT(t))) < 0)
+ return r;
+ }
+
+ return 0;
+}
+
+static ExecCommand *exec_command_new(const char *path, const char *arg1) {
+ ExecCommand *c;
+
+ if (!(c = new0(ExecCommand, 1)))
+ return NULL;
+
+ if (!(c->path = strdup(path))) {
+ free(c);
+ return NULL;
+ }
+
+ if (!(c->argv = strv_new(path, arg1, NULL))) {
+ free(c->path);
+ free(c);
+ return NULL;
+ }
+
+ return c;
+}
+
+static int sysv_exec_commands(Service *s) {
+ ExecCommand *c;
+
+ assert(s);
+ assert(s->sysv_path);
+
+ if (!(c = exec_command_new(s->sysv_path, "start")))
+ return -ENOMEM;
+ exec_command_append_list(s->exec_command+SERVICE_EXEC_START, c);
+
+ if (!(c = exec_command_new(s->sysv_path, "stop")))
+ return -ENOMEM;
+ exec_command_append_list(s->exec_command+SERVICE_EXEC_STOP, c);
+
+ if (!(c = exec_command_new(s->sysv_path, "reload")))
+ return -ENOMEM;
+ exec_command_append_list(s->exec_command+SERVICE_EXEC_RELOAD, c);
+
+ return 0;
+}
+
+static int service_load_sysv_path(Service *s, const char *path) {
+ FILE *f;
+ Unit *u;
+ unsigned line = 0;
+ int r;
+ enum {
+ NORMAL,
+ DESCRIPTION,
+ LSB,
+ LSB_DESCRIPTION
+ } state = NORMAL;
+ bool has_lsb = false;
+
+ u = UNIT(s);
+
+ if (!(f = fopen(path, "re"))) {
+ r = errno == ENOENT ? 0 : -errno;
+ goto finish;
+ }
+
+ s->type = SERVICE_FORKING;
+ s->restart = SERVICE_ONCE;
+
+ free(s->sysv_path);
+ if (!(s->sysv_path = strdup(path))) {
+ r = -ENOMEM;
+ goto finish;
+ }
+
+ while (!feof(f)) {
+ char l[LINE_MAX], *t;
+
+ if (!fgets(l, sizeof(l), f)) {
+ if (feof(f))
+ break;
+
+ r = -errno;
+ log_error("Failed to read configuration file '%s': %s", path, strerror(-r));
+ goto finish;
+ }
+
+ line++;
+
+ t = strstrip(l);
+ if (*t != '#')
+ continue;
+
+ if (state == NORMAL && streq(t, "### BEGIN INIT INFO")) {
+ state = LSB;
+ has_lsb = true;
+ continue;
+ }
+
+ if ((state == LSB_DESCRIPTION || state == LSB) && streq(t, "### END INIT INFO")) {
+ state = NORMAL;
+ continue;
+ }
+
+ t++;
+ t += strspn(t, WHITESPACE);
+
+ if (state == NORMAL) {
+
+ /* Try to parse Red Hat style chkconfig headers */
+
+ if (startswith(t, "chkconfig:")) {
+ int start_priority;
+
+ state = NORMAL;
+
+ if (sscanf(t+10, "%*15s %i %*i",
+ &start_priority) != 1) {
+
+ log_warning("[%s:%u] Failed to parse chkconfig line. Ignoring.", path, line);
+ continue;
+ }
+
+ if (start_priority < 0 || start_priority > 99) {
+ log_warning("[%s:%u] Start priority out of range. Ignoring.", path, line);
+ continue;
+ }
+
+ s->sysv_start_priority = start_priority;
+
+ } else if (startswith(t, "description:")) {
+
+ size_t k = strlen(t);
+ char *d;
+
+ if (t[k-1] == '\\') {
+ state = DESCRIPTION;
+ t[k-1] = 0;
+ }
+
+ if (!(d = strdup(strstrip(t+12)))) {
+ r = -ENOMEM;
+ goto finish;
+ }
+
+ free(u->meta.description);
+ u->meta.description = d;
+
+ } else if (startswith(t, "pidfile:")) {
+
+ char *fn;
+
+ state = NORMAL;
+
+ fn = strstrip(t+8);
+ if (!path_is_absolute(fn)) {
+ log_warning("[%s:%u] PID file not absolute. Ignoring.", path, line);
+ continue;
+ }
+
+ if (!(fn = strdup(fn))) {
+ r = -ENOMEM;
+ goto finish;
+ }
+
+ free(s->pid_file);
+ s->pid_file = fn;
+ }
+
+ } else if (state == DESCRIPTION) {
+
+ /* Try to parse Red Hat style description
+ * continuation */
+
+ size_t k = strlen(t);
+ char *d;
+
+ if (t[k-1] == '\\')
+ t[k-1] = 0;
+ else
+ state = NORMAL;
+
+ assert(u->meta.description);
+ if (asprintf(&d, "%s %s", u->meta.description, strstrip(t)) < 0) {
+ r = -ENOMEM;
+ goto finish;
+ }
+
+ free(u->meta.description);
+ u->meta.description = d;
+
+ } else if (state == LSB || state == LSB_DESCRIPTION) {
+
+ if (startswith(t, "Provides:")) {
+ char *i, *w;
+ size_t z;
+
+ state = LSB;
+
+ FOREACH_WORD(w, z, t+9, i) {
+ char *n, *m;
+
+ if (!(n = strndup(w, z))) {
+ r = -ENOMEM;
+ goto finish;
+ }
+
+ r = sysv_translate_name(n, &m);
+ free(n);
+
+ if (r < 0)
+ goto finish;
+
+ if (r == 0)
+ continue;
+
+ 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)) >= 0)
+ r = unit_add_dependency_by_name(u, UNIT_BEFORE, m);
+ }
+
+ free(m);
+
+ if (r < 0)
+ goto finish;
+ }
+
+ } else if (startswith(t, "Required-Start:") ||
+ startswith(t, "Should-Start:")) {
+ char *i, *w;
+ size_t z;
+
+ state = LSB;
+
+ FOREACH_WORD(w, z, strchr(t, ':')+1, i) {
+ char *n, *m;
+
+ if (!(n = strndup(w, z))) {
+ r = -ENOMEM;
+ goto finish;
+ }
+
+ r = sysv_translate_name(n, &m);
+ free(n);
+
+ if (r < 0)
+ goto finish;
+
+ 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);
+ free(m);
+
+ if (r < 0)
+ goto finish;
+ }
+
+ } else if (startswith(t, "Description:")) {
+ char *d;
+
+ state = LSB_DESCRIPTION;
+
+ if (!(d = strdup(strstrip(t+12)))) {
+ r = -ENOMEM;
+ goto finish;
+ }
+
+ free(u->meta.description);
+ u->meta.description = d;
+
+ } else if (startswith(t, "Short-Description:") && !u->meta.description) {
+ char *d;
+
+ /* We use the short description only
+ * if no long description is set. */
+
+ state = LSB;
+
+ if (!(d = strdup(strstrip(t+18)))) {
+ r = -ENOMEM;
+ goto finish;
+ }
+
+ free(u->meta.description);
+ u->meta.description = d;
+
+ } else if (state == LSB_DESCRIPTION) {
+
+ if (startswith(l, "#\t") || startswith(l, "# ")) {
+ char *d;
+
+ assert(u->meta.description);
+ if (asprintf(&d, "%s %s", u->meta.description, t) < 0) {
+ r = -ENOMEM;
+ goto finish;
+ }
+
+ free(u->meta.description);
+ u->meta.description = d;
+ } else
+ state = LSB;
+ }
+ }
+ }
+
+ /* If the init script has no LSB header, then let's
+ * enforce the ordering via the chkconfig
+ * priorities */
+
+ if (!has_lsb)
+ if ((r = sysv_chkconfig_order(s)) < 0)
+ goto finish;
+
+ if ((r = sysv_exec_commands(s)) < 0)
+ goto finish;
+
+ r = 1;
+
+finish:
+
+ if (f)
+ fclose(f);
+
+ return r;
+}
+
+static int service_load_sysv_name(Service *s, const char *name) {
+ char **p;
+
+ assert(s);
+ assert(name);
+
+ STRV_FOREACH(p, UNIT(s)->meta.manager->sysvinit_path) {
+ char *path;
+ int r;
+
+ if (asprintf(&path, "%s/%s", *p, name) < 0)
+ return -ENOMEM;
+
+ assert(endswith(path, ".service"));
+ path[strlen(path)-8] = 0;
+
+ r = service_load_sysv_path(s, path);
+ free(path);
+
+ if (r != 0)
+ return r;
+ }
+
+ return 0;
+}
+
static int service_load_sysv(Service *s) {
+ const char *t;
+ Iterator i;
+ int r;
+
assert(s);
/* Load service data from SysV init scripts, preferably with
* LSB headers ... */
- return -ENOENT;
+ if (strv_isempty(UNIT(s)->meta.manager->sysvinit_path))
+ return 0;
+
+ if ((t = unit_id(UNIT(s))))
+ if ((r = service_load_sysv_name(s, t)) != 0)
+ return r;
+
+ SET_FOREACH(t, UNIT(s)->meta.names, i)
+ if ((r == service_load_sysv_name(s, t)) != 0)
+ return r;
+
+ return 0;
}
static int service_init(Unit *u) {
@@ -83,6 +562,10 @@ static int service_init(Unit *u) {
s->state = SERVICE_DEAD;
+ s->sysv_start_priority = -1;
+ s->permissions_start_only = false;
+ s->root_directory_start_only = false;
+
RATELIMIT_INIT(s->ratelimit, 10*USEC_PER_SEC, 5);
/* Load a .service file */
@@ -91,7 +574,7 @@ static int service_init(Unit *u) {
return r;
}
- /* Load a classic init script as a fallback, if we couldn*t find anything */
+ /* Load a classic init script as a fallback, if we couldn't find anything */
if (r == 0)
if ((r = service_load_sysv(s)) <= 0) {
service_done(u);
@@ -104,6 +587,12 @@ static int service_init(Unit *u) {
return r;
}
+ /* Add default cgroup */
+ if ((r = unit_add_default_cgroup(u)) < 0) {
+ service_done(u);
+ return r;
+ }
+
return 0;
}
@@ -111,17 +600,23 @@ static void service_dump(Unit *u, FILE *f, const char *prefix) {
ServiceExecCommand c;
Service *s = SERVICE(u);
- char *prefix2;
+ const char *prefix2;
+ char *p2;
assert(s);
- prefix2 = strappend(prefix, "\t");
- if (!prefix2)
- prefix2 = "";
+ p2 = strappend(prefix, "\t");
+ prefix2 = p2 ? p2 : prefix;
fprintf(f,
- "%sService State: %s\n",
- prefix, service_state_to_string(s->state));
+ "%sService State: %s\n"
+ "%sPermissionsStartOnly: %s\n"
+ "%sRootDirectoryStartOnly: %s\n"
+ "%sValidNoProcess: %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));
if (s->pid_file)
fprintf(f,
@@ -142,7 +637,17 @@ static void service_dump(Unit *u, FILE *f, const char *prefix) {
exec_command_dump_list(s->exec_command[c], f, prefix2);
}
- free(prefix2);
+ if (s->sysv_path)
+ fprintf(f,
+ "%sSysV Init Script Path: %s\n",
+ prefix, s->sysv_path);
+
+ if (s->sysv_start_priority >= 0)
+ fprintf(f,
+ "%sSysV Start Priority: %i\n",
+ prefix, s->sysv_start_priority);
+
+ free(p2);
}
static int service_load_pid_file(Service *s) {
@@ -224,7 +729,7 @@ fail:
static int service_notify_sockets(Service *s) {
Iterator i;
Set *set;
- Socket *socket;
+ Socket *sock;
int r;
assert(s);
@@ -234,8 +739,8 @@ static int service_notify_sockets(Service *s) {
if ((r = service_get_sockets(s, &set)) < 0)
return r;
- SET_FOREACH(socket, set, i)
- socket_notify_service_dead(socket);
+ SET_FOREACH(sock, set, i)
+ socket_notify_service_dead(sock);
set_free(set);
@@ -262,7 +767,8 @@ static void service_set_state(Service *s, ServiceState state) {
state != SERVICE_AUTO_RESTART)
unit_unwatch_timer(UNIT(s), &s->timer_watch);
- if (state != SERVICE_START_POST &&
+ if (state != SERVICE_START &&
+ state != SERVICE_START_POST &&
state != SERVICE_RUNNING &&
state != SERVICE_RELOAD &&
state != SERVICE_STOP &&
@@ -318,7 +824,7 @@ static int service_collect_fds(Service *s, int **fds, unsigned *n_fds) {
int *rfds = NULL;
unsigned rn_fds = 0;
Set *set;
- Socket *socket;
+ Socket *sock;
assert(s);
assert(fds);
@@ -327,11 +833,11 @@ static int service_collect_fds(Service *s, int **fds, unsigned *n_fds) {
if ((r = service_get_sockets(s, &set)) < 0)
return r;
- SET_FOREACH(socket, set, i) {
+ SET_FOREACH(sock, set, i) {
int *cfds;
unsigned cn_fds;
- if ((r = socket_collect_fds(socket, &cfds, &cn_fds)) < 0)
+ if ((r = socket_collect_fds(sock, &cfds, &cn_fds)) < 0)
goto fail;
if (!cfds)
@@ -373,7 +879,15 @@ fail:
return r;
}
-static int service_spawn(Service *s, ExecCommand *c, bool timeout, bool pass_fds, pid_t *_pid) {
+static int service_spawn(
+ Service *s,
+ ExecCommand *c,
+ bool timeout,
+ bool pass_fds,
+ bool apply_permissions,
+ bool apply_chroot,
+ pid_t *_pid) {
+
pid_t pid;
int r;
int *fds = NULL;
@@ -393,7 +907,13 @@ static int service_spawn(Service *s, ExecCommand *c, bool timeout, bool pass_fds
} else
unit_unwatch_timer(UNIT(s), &s->timer_watch);
- if ((r = exec_spawn(c, &s->exec_context, fds, n_fds, &pid)) < 0)
+ if ((r = exec_spawn(c,
+ &s->exec_context,
+ fds, n_fds,
+ apply_permissions,
+ apply_chroot,
+ UNIT(s)->meta.cgroup_bondings,
+ &pid)) < 0)
goto fail;
if ((r = unit_watch_pid(UNIT(s), pid)) < 0)
@@ -449,7 +969,13 @@ static void service_enter_stop_post(Service *s, bool success) {
s->failure = true;
if ((s->control_command = s->exec_command[SERVICE_EXEC_STOP_POST]))
- if ((r = service_spawn(s, s->control_command, true, false, &s->control_pid)) < 0)
+ if ((r = service_spawn(s,
+ s->control_command,
+ true,
+ false,
+ !s->permissions_start_only,
+ !s->root_directory_start_only,
+ &s->control_pid)) < 0)
goto fail;
@@ -525,7 +1051,13 @@ static void service_enter_stop(Service *s, bool success) {
s->failure = true;
if ((s->control_command = s->exec_command[SERVICE_EXEC_STOP]))
- if ((r = service_spawn(s, s->control_command, true, false, &s->control_pid)) < 0)
+ if ((r = service_spawn(s,
+ s->control_command,
+ true,
+ false,
+ !s->permissions_start_only,
+ !s->root_directory_start_only,
+ &s->control_pid)) < 0)
goto fail;
service_set_state(s, SERVICE_STOP);
@@ -545,7 +1077,13 @@ static void service_enter_start_post(Service *s) {
assert(s);
if ((s->control_command = s->exec_command[SERVICE_EXEC_START_POST]))
- if ((r = service_spawn(s, s->control_command, true, false, &s->control_pid)) < 0)
+ if ((r = service_spawn(s,
+ s->control_command,
+ true,
+ false,
+ !s->permissions_start_only,
+ !s->root_directory_start_only,
+ &s->control_pid)) < 0)
goto fail;
@@ -570,7 +1108,13 @@ static void service_enter_start(Service *s) {
assert(s->exec_command[SERVICE_EXEC_START]);
assert(!s->exec_command[SERVICE_EXEC_START]->command_next);
- if ((r = service_spawn(s, s->exec_command[SERVICE_EXEC_START], s->type == SERVICE_FORKING, true, &pid)) < 0)
+ if ((r = service_spawn(s,
+ s->exec_command[SERVICE_EXEC_START],
+ s->type == SERVICE_FORKING,
+ true,
+ true,
+ true,
+ &pid)) < 0)
goto fail;
service_set_state(s, SERVICE_START);
@@ -590,6 +1134,13 @@ static void service_enter_start(Service *s) {
s->control_pid = pid;
s->control_command = s->exec_command[SERVICE_EXEC_START];
+ } else if (s->type == SERVICE_FINISH) {
+
+ /* For finishing services we wait until the start
+ * process exited, too, but it is our main process. */
+
+ s->main_pid = pid;
+ s->control_command = s->exec_command[SERVICE_EXEC_START];
} else
assert_not_reached("Unknown service type");
@@ -606,7 +1157,13 @@ static void service_enter_start_pre(Service *s) {
assert(s);
if ((s->control_command = s->exec_command[SERVICE_EXEC_START_PRE]))
- if ((r = service_spawn(s, s->control_command, true, false, &s->control_pid)) < 0)
+ if ((r = service_spawn(s,
+ s->control_command,
+ true,
+ false,
+ !s->permissions_start_only,
+ !s->root_directory_start_only,
+ &s->control_pid)) < 0)
goto fail;
service_set_state(s, SERVICE_START_PRE);
@@ -644,7 +1201,13 @@ static void service_enter_reload(Service *s) {
assert(s);
if ((s->control_command = s->exec_command[SERVICE_EXEC_RELOAD]))
- if ((r = service_spawn(s, s->control_command, true, false, &s->control_pid)) < 0)
+ if ((r = service_spawn(s,
+ s->control_command,
+ true,
+ false,
+ !s->permissions_start_only,
+ !s->root_directory_start_only,
+ &s->control_pid)) < 0)
goto fail;
service_set_state(s, SERVICE_RELOAD);
@@ -671,7 +1234,13 @@ static void service_run_next(Service *s, bool success) {
s->control_command = s->control_command->command_next;
- if ((r = service_spawn(s, s->control_command, true, false, &s->control_pid)) < 0)
+ if ((r = service_spawn(s,
+ s->control_command,
+ true,
+ false,
+ !s->permissions_start_only,
+ !s->root_directory_start_only,
+ &s->control_pid)) < 0)
goto fail;
return;
@@ -782,7 +1351,7 @@ static int main_pid_good(Service *s) {
return s->main_pid > 0;
/* We don't know the pid */
- return -1;
+ return -EAGAIN;
}
static bool control_pid_good(Service *s) {
@@ -791,6 +1360,15 @@ static bool control_pid_good(Service *s) {
return s->control_pid > 0;
}
+static int cgroup_good(Service *s) {
+ assert(s);
+
+ if (s->valid_no_process)
+ return -EAGAIN;
+
+ return cgroup_bonding_is_empty_list(UNIT(s)->meta.cgroup_bondings);
+}
+
static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) {
Service *s = SERVICE(u);
bool success;
@@ -806,7 +1384,7 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) {
exec_status_fill(&s->main_exec_status, pid, code, status);
s->main_pid = 0;
- if (s->type == SERVICE_SIMPLE) {
+ if (s->type == SERVICE_SIMPLE || s->type == SERVICE_FINISH) {
assert(s->exec_command[SERVICE_EXEC_START]);
s->exec_command[SERVICE_EXEC_START]->exec_status = s->main_exec_status;
}
@@ -825,6 +1403,16 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) {
* done */
break;
+ case SERVICE_START:
+ assert(s->type == SERVICE_FINISH);
+
+ /* This was our main goal, so let's go on */
+ if (success)
+ service_enter_start_post(s);
+ else
+ service_enter_stop(s, false);
+ break;
+
case SERVICE_RUNNING:
service_enter_stop(s, success);
break;
@@ -854,7 +1442,7 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) {
* don't care about failing commands. */
if (s->control_command->command_next &&
- (success || (s->state == SERVICE_EXEC_STOP || s->state == SERVICE_EXEC_STOP_POST)))
+ (success || (s->state == SERVICE_STOP || s->state == SERVICE_STOP_POST)))
/* There is another command to *
* execute, so let's do that. */
@@ -913,7 +1501,7 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) {
case SERVICE_RELOAD:
if (success) {
- if (main_pid_good(s) != 0)
+ if (main_pid_good(s) != 0 && cgroup_good(s) != 0)
service_set_state(s, SERVICE_RUNNING);
else
service_enter_stop(s, true);
@@ -1016,6 +1604,141 @@ static void service_timer_event(Unit *u, uint64_t elapsed, Watch* w) {
}
}
+static void service_cgroup_notify_event(Unit *u) {
+ Service *s = SERVICE(u);
+
+ assert(u);
+
+ log_debug("%s: cgroup is empty", unit_id(u));
+
+ switch (s->state) {
+
+ /* Waiting for SIGCHLD is usually more interesting,
+ * because it includes return codes/signals. Which is
+ * why we ignore the cgroup events for most cases,
+ * except when we don't know pid which to expect the
+ * SIGCHLD for. */
+
+ case SERVICE_RUNNING:
+
+ if (!s->valid_no_process && main_pid_good(s) <= 0)
+ service_enter_stop(s, true);
+
+ break;
+
+ default:
+ ;
+ }
+}
+
+static int service_enumerate(Manager *m) {
+
+ static const char * const rcnd[] = {
+ "../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
+ };
+
+ char **p;
+ unsigned i;
+ DIR *d = NULL;
+ char *path = NULL, *fpath = NULL, *name = NULL;
+ int r;
+
+ assert(m);
+
+ STRV_FOREACH(p, m->sysvinit_path)
+ for (i = 0; i < ELEMENTSOF(rcnd); i += 2) {
+ struct dirent *de;
+
+ free(path);
+ path = NULL;
+ if (asprintf(&path, "%s/%s", *p, rcnd[i]) < 0) {
+ r = -ENOMEM;
+ goto finish;
+ }
+
+ if (d)
+ closedir(d);
+
+ if (!(d = opendir(path))) {
+ if (errno != ENOENT)
+ log_warning("opendir() failed on %s: %s", path, strerror(errno));
+
+ continue;
+ }
+
+ while ((de = readdir(d))) {
+ Unit *runlevel, *service;
+
+ if (ignore_file(de->d_name))
+ continue;
+
+ if (de->d_name[0] != 'S' && de->d_name[0] != 'K')
+ continue;
+
+ if (strlen(de->d_name) < 4)
+ continue;
+
+ free(fpath);
+ fpath = NULL;
+ if (asprintf(&fpath, "%s/%s/%s", *p, rcnd[i], de->d_name) < 0) {
+ r = -ENOMEM;
+ goto finish;
+ }
+
+ if (access(fpath, X_OK) < 0) {
+
+ if (errno != ENOENT)
+ log_warning("access() failed on %s: %s", fpath, strerror(errno));
+
+ continue;
+ }
+
+ free(name);
+ name = NULL;
+ if (asprintf(&name, "%s.service", de->d_name+3) < 0) {
+ r = -ENOMEM;
+ goto finish;
+ }
+
+ if ((r = manager_load_unit(m, name, &service)) < 0)
+ goto finish;
+
+ if ((r = manager_load_unit(m, rcnd[i+1], &runlevel)) < 0)
+ goto finish;
+
+ if (de->d_name[0] == 'S') {
+ if ((r = unit_add_dependency(runlevel, UNIT_WANTS, service)) < 0)
+ goto finish;
+
+ if ((r = unit_add_dependency(runlevel, UNIT_AFTER, service)) < 0)
+ goto finish;
+ } else {
+ if ((r = unit_add_dependency(runlevel, UNIT_CONFLICTS, service)) < 0)
+ goto finish;
+
+ if ((r = unit_add_dependency(runlevel, UNIT_BEFORE, service)) < 0)
+ goto finish;
+ }
+ }
+ }
+
+ r = 0;
+
+finish:
+ free(path);
+ free(fpath);
+ free(name);
+ closedir(d);
+
+ return r;
+}
+
static const char* const service_state_table[_SERVICE_STATE_MAX] = {
[SERVICE_DEAD] = "dead",
[SERVICE_START_PRE] = "start-pre",
@@ -1080,4 +1803,8 @@ const UnitVTable service_vtable = {
.sigchld_event = service_sigchld_event,
.timer_event = service_timer_event,
+
+ .cgroup_notify_empty = service_cgroup_notify_event,
+
+ .enumerate = service_enumerate
};