chiark / gitweb /
service: show service type when dumping state
[elogind.git] / service.c
index cef94175fb495acec755a4a07f051425f3449105..be23b57c4979556f8bc0615bc0a12696ad0c335f 100644 (file)
--- 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 <http://www.gnu.org/licenses/>.
+***/
+
 #include <errno.h>
 #include <signal.h>
+#include <dirent.h>
+#include <unistd.h>
 
 #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,
@@ -26,23 +52,6 @@ static const UnitActiveState state_translation_table[_SERVICE_STATE_MAX] = {
         [SERVICE_AUTO_RESTART] = UNIT_ACTIVATING,
 };
 
-static const char* const state_string_table[_SERVICE_STATE_MAX] = {
-        [SERVICE_DEAD] = "dead",
-        [SERVICE_START_PRE] = "start-pre",
-        [SERVICE_START] = "start",
-        [SERVICE_START_POST] = "post",
-        [SERVICE_RUNNING] = "running",
-        [SERVICE_RELOAD] = "reload",
-        [SERVICE_STOP] = "stop",
-        [SERVICE_STOP_SIGTERM] = "stop-sigterm",
-        [SERVICE_STOP_SIGKILL] = "stop-sigkill",
-        [SERVICE_STOP_POST] = "stop-post",
-        [SERVICE_FINAL_SIGTERM] = "final-sigterm",
-        [SERVICE_FINAL_SIGKILL] = "final-sigkill",
-        [SERVICE_MAINTAINANCE] = "maintainance",
-        [SERVICE_AUTO_RESTART] = "auto-restart",
-};
-
 static void service_done(Unit *u) {
         Service *s = SERVICE(u);
 
@@ -51,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;
@@ -70,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) {
@@ -100,51 +562,63 @@ static int service_init(Unit *u) {
 
         s->state = SERVICE_DEAD;
 
-        /* Load a .service file */
-        r = unit_load_fragment(u);
+        s->sysv_start_priority = -1;
+        s->permissions_start_only = false;
+        s->root_directory_start_only = false;
 
-        /* Load a classic init script as a fallback */
-        if (r == -ENOENT)
-                r = service_load_sysv(s);
+        RATELIMIT_INIT(s->ratelimit, 10*USEC_PER_SEC, 5);
 
-        if (r < 0) {
+        /* Load a .service file */
+        if ((r = unit_load_fragment(u)) < 0) {
                 service_done(u);
                 return r;
         }
 
+        /* 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);
+                        return r < 0 ? r : -ENOENT;
+                }
+
         /* Load dropin directory data */
         if ((r = unit_load_dropin(u)) < 0) {
                 service_done(u);
                 return r;
         }
 
+        /* Add default cgroup */
+        if ((r = unit_add_default_cgroup(u)) < 0) {
+                service_done(u);
+                return r;
+        }
+
         return 0;
 }
 
 static void service_dump(Unit *u, FILE *f, const char *prefix) {
 
-        static const char* const command_table[_SERVICE_EXEC_MAX] = {
-                [SERVICE_EXEC_START_PRE] = "ExecStartPre",
-                [SERVICE_EXEC_START] = "ExecStart",
-                [SERVICE_EXEC_START_POST] = "ExecStartPost",
-                [SERVICE_EXEC_RELOAD] = "ExecReload",
-                [SERVICE_EXEC_STOP] = "ExecStop",
-                [SERVICE_EXEC_STOP_POST] = "ExecStopPost",
-        };
-
         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, state_string_table[s->state]);
+                "%sService State: %s\n"
+                "%sPermissionsStartOnly: %s\n"
+                "%sRootDirectoryStartOnly: %s\n"
+                "%sValidNoProcess: %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, service_type_to_string(s->type));
 
         if (s->pid_file)
                 fprintf(f,
@@ -160,12 +634,22 @@ static void service_dump(Unit *u, FILE *f, const char *prefix) {
                         continue;
 
                 fprintf(f, "%s→ %s:\n",
-                        prefix, command_table[c]);
+                        prefix, service_exec_command_to_string(c));
 
                 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) {
@@ -198,6 +682,73 @@ static int service_load_pid_file(Service *s) {
         return 0;
 }
 
+static int service_get_sockets(Service *s, Set **_set) {
+        Set *set;
+        Iterator i;
+        char *t;
+        int r;
+
+        assert(s);
+        assert(_set);
+
+        /* Collects all Socket objects that belong to this
+         * service. Note that a service might have multiple sockets
+         * via multiple names. */
+
+        if (!(set = set_new(NULL, NULL)))
+                return -ENOMEM;
+
+        SET_FOREACH(t, UNIT(s)->meta.names, i) {
+                char *k;
+                Unit *p;
+
+                /* Look for all socket objects that go by any of our
+                 * units and collect their fds */
+
+                if (!(k = unit_name_change_suffix(t, ".socket"))) {
+                        r = -ENOMEM;
+                        goto fail;
+                }
+
+                p = manager_get_unit(UNIT(s)->meta.manager, k);
+                free(k);
+
+                if (!p) continue;
+
+                if ((r = set_put(set, p)) < 0)
+                        goto fail;
+        }
+
+        *_set = set;
+        return 0;
+
+fail:
+        set_free(set);
+        return r;
+}
+
+
+static int service_notify_sockets(Service *s) {
+        Iterator i;
+        Set *set;
+        Socket *sock;
+        int r;
+
+        assert(s);
+
+        /* Notifies all our sockets when we die */
+
+        if ((r = service_get_sockets(s, &set)) < 0)
+                return r;
+
+        SET_FOREACH(sock, set, i)
+                socket_notify_service_dead(sock);
+
+        set_free(set);
+
+        return 0;
+}
+
 static void service_set_state(Service *s, ServiceState state) {
         ServiceState old_state;
         assert(s);
@@ -218,7 +769,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 &&
@@ -252,7 +804,18 @@ static void service_set_state(Service *s, ServiceState state) {
             state != SERVICE_STOP_POST)
                 s->control_command = NULL;
 
-        log_debug("%s changing %s â†’ %s", unit_id(UNIT(s)), state_string_table[old_state], state_string_table[state]);
+        if (state == SERVICE_DEAD ||
+            state == SERVICE_STOP ||
+            state == SERVICE_STOP_SIGTERM ||
+            state == SERVICE_STOP_SIGKILL ||
+            state == SERVICE_STOP_POST ||
+            state == SERVICE_FINAL_SIGTERM ||
+            state == SERVICE_FINAL_SIGKILL ||
+            state == SERVICE_MAINTAINANCE ||
+            state == SERVICE_AUTO_RESTART)
+                service_notify_sockets(s);
+
+        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]);
 }
@@ -262,33 +825,21 @@ static int service_collect_fds(Service *s, int **fds, unsigned *n_fds) {
         int r;
         int *rfds = NULL;
         unsigned rn_fds = 0;
-        char *t;
+        Set *set;
+        Socket *sock;
 
         assert(s);
         assert(fds);
         assert(n_fds);
 
-        SET_FOREACH(t, UNIT(s)->meta.names, i) {
-                char *k;
-                Unit *p;
+        if ((r = service_get_sockets(s, &set)) < 0)
+                return r;
+
+        SET_FOREACH(sock, set, i) {
                 int *cfds;
                 unsigned cn_fds;
 
-                /* Look for all socket objects that go by any of our
-                 * units and collect their fds */
-
-                if (!(k = unit_name_change_suffix(t, ".socket"))) {
-                        r = -ENOMEM;
-                        goto fail;
-                }
-
-                p = manager_get_unit(UNIT(s)->meta.manager, k);
-                free(k);
-
-                if (!p)
-                        continue;
-
-                if ((r = socket_collect_fds(SOCKET(p), &cfds, &cn_fds)) < 0)
+                if ((r = socket_collect_fds(sock, &cfds, &cn_fds)) < 0)
                         goto fail;
 
                 if (!cfds)
@@ -318,14 +869,27 @@ static int service_collect_fds(Service *s, int **fds, unsigned *n_fds) {
 
         *fds = rfds;
         *n_fds = rn_fds;
+
+        set_free(set);
+
         return 0;
 
 fail:
+        set_free(set);
         free(rfds);
+
         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;
@@ -345,7 +909,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)
@@ -400,13 +970,20 @@ static void service_enter_stop_post(Service *s, bool success) {
         if (!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 ((s->control_command = s->exec_command[SERVICE_EXEC_STOP_POST]))
+                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_POST);
-        } else
+
+        service_set_state(s, SERVICE_STOP_POST);
+
+        if (!s->control_command)
                 service_enter_dead(s, true, true);
 
         return;
@@ -447,9 +1024,11 @@ static void service_enter_signal(Service *s, ServiceState state, bool success) {
 
                 if (r < 0)
                         goto fail;
+        }
 
-                service_set_state(s, state);
-        } else
+        service_set_state(s, state);
+
+        if (s->main_pid <= 0 && s->control_pid <= 0)
                 service_enter_dead(s, true, true);
 
         return;
@@ -473,13 +1052,19 @@ static void service_enter_stop(Service *s, bool success) {
         if (!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 ((s->control_command = s->exec_command[SERVICE_EXEC_STOP]))
+                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);
-        } else
+        service_set_state(s, SERVICE_STOP);
+
+        if (!s->control_command)
                 service_enter_signal(s, SERVICE_STOP_SIGTERM, true);
 
         return;
@@ -493,13 +1078,20 @@ static void service_enter_start_post(Service *s) {
         int r;
         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 ((s->control_command = s->exec_command[SERVICE_EXEC_START_POST]))
+                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_POST);
-        } else
+
+        service_set_state(s, SERVICE_START_POST);
+
+        if (!s->control_command)
                 service_set_state(s, SERVICE_RUNNING);
 
         return;
@@ -518,9 +1110,17 @@ 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);
+
         if (s->type == SERVICE_SIMPLE) {
                 /* For simple services we immediately start
                  * the START_POST binaries. */
@@ -536,7 +1136,13 @@ static void service_enter_start(Service *s) {
 
                 s->control_pid = pid;
                 s->control_command = s->exec_command[SERVICE_EXEC_START];
-                service_set_state(s, SERVICE_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");
 
@@ -552,13 +1158,19 @@ 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 ((s->control_command = s->exec_command[SERVICE_EXEC_START_PRE]))
+                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);
-        } else
+        service_set_state(s, SERVICE_START_PRE);
+
+        if (!s->control_command)
                 service_enter_start(s);
 
         return;
@@ -590,13 +1202,19 @@ 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 ((s->control_command = s->exec_command[SERVICE_EXEC_RELOAD]))
+                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);
-        } else
+        service_set_state(s, SERVICE_RELOAD);
+
+        if (!s->control_command)
                 service_set_state(s, SERVICE_RUNNING);
 
         return;
@@ -618,7 +1236,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;
@@ -657,6 +1281,12 @@ static int service_start(Unit *u) {
 
         assert(s->state == SERVICE_DEAD || s->state == SERVICE_MAINTAINANCE || s->state == SERVICE_AUTO_RESTART);
 
+        /* Make sure we don't enter a busy loop of some kind. */
+        if (!ratelimit_test(&s->ratelimit)) {
+                log_warning("%s start request repeated too quickly, refusing to start.", unit_id(u));
+                return -EAGAIN;
+        }
+
         s->failure = false;
         s->main_pid_known = false;
 
@@ -723,7 +1353,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) {
@@ -732,6 +1362,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;
@@ -739,7 +1378,7 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) {
         assert(s);
         assert(pid >= 0);
 
-        success = code == CLD_EXITED || status == 0;
+        success = code == CLD_EXITED && status == 0;
         s->failure = s->failure || !success;
 
         if (s->main_pid == pid) {
@@ -747,12 +1386,12 @@ 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;
                 }
 
-                log_debug("%s: main process exited, code=%s status=%i", unit_id(u), sigchld_code(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. */
@@ -766,6 +1405,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;
@@ -789,13 +1438,13 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) {
                 exec_status_fill(&s->control_command->exec_status, pid, code, status);
                 s->control_pid = 0;
 
-                log_debug("%s: control process exited, code=%s status=%i", unit_id(u), sigchld_code(code), status);
+                log_debug("%s: control process exited, code=%s status=%i", unit_id(u), sigchld_code_to_string(code), status);
 
                 /* If we are shutting things down anyway we
                  * 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. */
@@ -806,6 +1455,8 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) {
                         /* No further commands for this step, so let's
                          * figure out what to do next */
 
+                        log_debug("%s got final SIGCHLD for state %s", unit_id(u), service_state_to_string(s->state));
+
                         switch (s->state) {
 
                         case SERVICE_START_PRE:
@@ -852,7 +1503,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);
@@ -955,6 +1606,187 @@ 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",
+        [SERVICE_START] = "start",
+        [SERVICE_START_POST] = "start-post",
+        [SERVICE_RUNNING] = "running",
+        [SERVICE_RELOAD] = "reload",
+        [SERVICE_STOP] = "stop",
+        [SERVICE_STOP_SIGTERM] = "stop-sigterm",
+        [SERVICE_STOP_SIGKILL] = "stop-sigkill",
+        [SERVICE_STOP_POST] = "stop-post",
+        [SERVICE_FINAL_SIGTERM] = "final-sigterm",
+        [SERVICE_FINAL_SIGKILL] = "final-sigkill",
+        [SERVICE_MAINTAINANCE] = "maintainance",
+        [SERVICE_AUTO_RESTART] = "auto-restart",
+};
+
+DEFINE_STRING_TABLE_LOOKUP(service_state, ServiceState);
+
+static const char* const service_restart_table[_SERVICE_RESTART_MAX] = {
+        [SERVICE_ONCE] = "once",
+        [SERVICE_RESTART_ON_SUCCESS] = "restart-on-success",
+        [SERVICE_RESTART_ALWAYS] = "restart-on-failure",
+};
+
+DEFINE_STRING_TABLE_LOOKUP(service_restart, ServiceRestart);
+
+static const char* const service_type_table[_SERVICE_TYPE_MAX] = {
+        [SERVICE_FORKING] = "forking",
+        [SERVICE_SIMPLE] = "simple",
+        [SERVICE_FINISH] = "finish"
+};
+
+DEFINE_STRING_TABLE_LOOKUP(service_type, ServiceType);
+
+static const char* const service_exec_command_table[_SERVICE_EXEC_MAX] = {
+        [SERVICE_EXEC_START_PRE] = "ExecStartPre",
+        [SERVICE_EXEC_START] = "ExecStart",
+        [SERVICE_EXEC_START_POST] = "ExecStartPost",
+        [SERVICE_EXEC_RELOAD] = "ExecReload",
+        [SERVICE_EXEC_STOP] = "ExecStop",
+        [SERVICE_EXEC_STOP_POST] = "ExecStopPost",
+};
+
+DEFINE_STRING_TABLE_LOOKUP(service_exec_command, ServiceExecCommand);
+
 const UnitVTable service_vtable = {
         .suffix = ".service",
 
@@ -973,4 +1805,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
 };