sysv: do not add sysv services that are not enabled in /etc/rcN.d/ to network.target...

[elogind.git] / src / service.c

diff --git a/src/service.c b/src/service.c
index 9086590cbb5b22386dff48fe48da824d41cfc92e..978dca9341d82918313887eebc551da47f5e42da 100644 (file)
--- a/src/service.c
+++ b/src/service.c
@@ -33,10 +33,10 @@
 #include "unit-name.h"
 #include "dbus-service.h"
 #include "special.h"
 #include "unit-name.h"
 #include "dbus-service.h"
 #include "special.h"

+#include "bus-errors.h"

 
 #define COMMENTS "#;\n"
 #define NEWLINES "\n\r"
 
 #define COMMENTS "#;\n"
 #define NEWLINES "\n\r"

-#define LINE_MAX 4096

 
 typedef enum RunlevelType {
         RUNLEVEL_UP,
 
 typedef enum RunlevelType {
         RUNLEVEL_UP,


@@ -49,20 +49,28 @@ static const struct {
         const char *target;
         const RunlevelType type;
 } rcnd_table[] = {
         const char *target;
         const RunlevelType type;
 } rcnd_table[] = {

-        /* Standard SysV runlevels */
-        { "rc0.d",  SPECIAL_POWEROFF_TARGET,  RUNLEVEL_DOWN },
+        /* Standard SysV runlevels for start-up */

         { "rc1.d",  SPECIAL_RESCUE_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 },
         { "rc1.d",  SPECIAL_RESCUE_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_REBOOT_TARGET,    RUNLEVEL_DOWN },

 
         /* SUSE style boot.d */
         { "boot.d", SPECIAL_SYSINIT_TARGET,   RUNLEVEL_SYSINIT },
 
         /* Debian style rcS.d */
         { "rcS.d",  SPECIAL_SYSINIT_TARGET,   RUNLEVEL_SYSINIT },
 
         /* SUSE style boot.d */
         { "boot.d", SPECIAL_SYSINIT_TARGET,   RUNLEVEL_SYSINIT },
 
         /* Debian style rcS.d */
         { "rcS.d",  SPECIAL_SYSINIT_TARGET,   RUNLEVEL_SYSINIT },

+
+        /* Standard SysV runlevels for shutdown */
+        { "rc0.d",  SPECIAL_POWEROFF_TARGET,  RUNLEVEL_DOWN },
+        { "rc6.d",  SPECIAL_REBOOT_TARGET,    RUNLEVEL_DOWN }
+
+        /* Note that the order here matters, as we read the
+           directories in this order, and we want to make sure that
+           sysv_start_priority is known when we first load the
+           unit. And that value we only know from S links. Hence
+           UP/SYSINIT must be read before DOWN */

 };
 
 #define RUNLEVELS_UP "12345"
 };
 
 #define RUNLEVELS_UP "12345"


@@ -527,7 +535,7 @@ static int service_load_sysv_path(Service *s, const char *path) {
 
                                 state = LSB;
 
 
                                 state = LSB;
 

-                                FOREACH_WORD(w, z, t+9, i) {
+                                FOREACH_WORD_QUOTED(w, z, t+9, i) {

                                         char *n, *m;
 
                                         if (!(n = strndup(w, z))) {
                                         char *n, *m;
 
                                         if (!(n = strndup(w, z))) {


@@ -546,8 +554,10 @@ static int service_load_sysv_path(Service *s, const char *path) {
 
                                         if (unit_name_to_type(m) == UNIT_SERVICE)
                                                 r = unit_add_name(u, m);
 
                                         if (unit_name_to_type(m) == UNIT_SERVICE)
                                                 r = unit_add_name(u, m);

+                                        else if (s->sysv_start_priority >= 0)
+                                                r = unit_add_two_dependencies_by_name_inverse(u, UNIT_AFTER, UNIT_WANTS, m, NULL, true);

                                         else
                                         else

-                                                r = unit_add_two_dependencies_by_name_inverse(u, UNIT_AFTER, UNIT_REQUIRES, m, NULL, true);
+                                                r = unit_add_dependency_by_name_inverse(u, UNIT_AFTER, m, NULL, true);

 
                                         free(m);
 
 
                                         free(m);
 


@@ -564,7 +574,7 @@ static int service_load_sysv_path(Service *s, const char *path) {
 
                                 state = LSB;
 
 
                                 state = LSB;
 

-                                FOREACH_WORD(w, z, strchr(t, ':')+1, i) {
+                                FOREACH_WORD_QUOTED(w, z, strchr(t, ':')+1, i) {

                                         char *n, *m;
 
                                         if (!(n = strndup(w, z))) {
                                         char *n, *m;
 
                                         if (!(n = strndup(w, z))) {


@@ -631,6 +641,7 @@ static int service_load_sysv_path(Service *s, const char *path) {
                                         goto finish;
                                 }
 
                                         goto finish;
                                 }
 

+                                free(u->meta.description);

                                 u->meta.description = d;
 
                         } else if (startswith_no_case(t, "X-Interactive:")) {
                                 u->meta.description = d;
 
                         } else if (startswith_no_case(t, "X-Interactive:")) {


@@ -684,9 +695,9 @@ static int service_load_sysv_path(Service *s, const char *path) {
         /* Special setting for all SysV services */
         s->type = SERVICE_FORKING;
         s->valid_no_process = true;
         /* Special setting for all SysV services */
         s->type = SERVICE_FORKING;
         s->valid_no_process = true;

-        s->kill_mode = KILL_PROCESS_GROUP;

         s->restart = SERVICE_ONCE;
         s->exec_context.std_output = EXEC_OUTPUT_TTY;
         s->restart = SERVICE_ONCE;
         s->exec_context.std_output = EXEC_OUTPUT_TTY;

+        s->exec_context.kill_mode = KILL_PROCESS_GROUP;

 
         u->meta.load_state = UNIT_LOADED;
         r = 0;
 
         u->meta.load_state = UNIT_LOADED;
         r = 0;


@@ -821,7 +832,7 @@ static int service_verify(Service *s) {
                 return -EINVAL;
         }
 
                 return -EINVAL;
         }
 

-        if (s->exec_context.pam_name && s->kill_mode != KILL_CONTROL_GROUP) {
+        if (s->exec_context.pam_name && s->exec_context.kill_mode != KILL_CONTROL_GROUP) {

                 log_error("%s has PAM enabled. Kill mode must be set to 'control-group'. Refusing.", s->meta.id);
                 return -EINVAL;
         }
                 log_error("%s has PAM enabled. Kill mode must be set to 'control-group'. Refusing.", s->meta.id);
                 return -EINVAL;
         }


@@ -928,14 +939,12 @@ static void service_dump(Unit *u, FILE *f, const char *prefix) {
                 "%sPermissionsStartOnly: %s\n"
                 "%sRootDirectoryStartOnly: %s\n"
                 "%sValidNoProcess: %s\n"
                 "%sPermissionsStartOnly: %s\n"
                 "%sRootDirectoryStartOnly: %s\n"
                 "%sValidNoProcess: %s\n"

-                "%sKillMode: %s\n"

                 "%sType: %s\n"
                 "%sNotifyAccess: %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),
                 "%sType: %s\n"
                 "%sNotifyAccess: %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),
                 prefix, notify_access_to_string(s->notify_access));
 
                 prefix, service_type_to_string(s->type),
                 prefix, notify_access_to_string(s->notify_access));
 


@@ -1180,6 +1189,11 @@ static void service_set_state(Service *s, ServiceState state) {
                 service_connection_unref(s);
         }
 
                 service_connection_unref(s);
         }
 

+        /* For the inactive states unit_notify() will trim the cgroup,
+         * but for exit we have to do that ourselves... */
+        if (state == SERVICE_EXITED)
+                cgroup_bonding_trim_list(s->meta.cgroup_bondings, true);
+

         if (old_state != state)
                 log_debug("%s changed %s -> %s", s->meta.id, service_state_to_string(old_state), service_state_to_string(state));
 
         if (old_state != state)
                 log_debug("%s changed %s -> %s", s->meta.id, service_state_to_string(old_state), service_state_to_string(state));
 


@@ -1323,14 +1337,15 @@ static int service_spawn(
                 bool pass_fds,
                 bool apply_permissions,
                 bool apply_chroot,
                 bool pass_fds,
                 bool apply_permissions,
                 bool apply_chroot,

+                bool apply_tty_stdin,

                 bool set_notify_socket,
                 pid_t *_pid) {
 
         pid_t pid;
         int r;
         int *fds = NULL, *fdsbuf = NULL;
                 bool set_notify_socket,
                 pid_t *_pid) {
 
         pid_t pid;
         int r;
         int *fds = NULL, *fdsbuf = NULL;

-        unsigned n_fds = 0;
-        char **argv = NULL, **env = NULL;
+        unsigned n_fds = 0, n_env = 0;
+        char **argv = NULL, **final_env = NULL, **our_env = NULL;

 
         assert(s);
         assert(c);
 
         assert(s);
         assert(c);


@@ -1363,63 +1378,65 @@ static int service_spawn(
                 goto fail;
         }
 
                 goto fail;
         }
 

-        if (set_notify_socket) {
-                char *t;
+        if (!(our_env = new0(char*, 3))) {
+                r = -ENOMEM;
+                goto fail;
+        }

 
 

-                if (asprintf(&t, "NOTIFY_SOCKET=@%s", s->meta.manager->notify_socket) < 0) {
+        if (set_notify_socket)
+                if (asprintf(our_env + n_env++, "NOTIFY_SOCKET=@%s", s->meta.manager->notify_socket) < 0) {

                         r = -ENOMEM;
                         goto fail;
                 }
 
                         r = -ENOMEM;
                         goto fail;
                 }
 

-                env = strv_env_set(s->meta.manager->environment, t);
-                free(t);
-
-                if (!env) {
+        if (s->main_pid > 0)
+                if (asprintf(our_env + n_env++, "MAINPID=%lu", (unsigned long) s->main_pid) < 0) {

                         r = -ENOMEM;
                         goto fail;
                 }
                         r = -ENOMEM;
                         goto fail;
                 }

-        } else
-                env = s->meta.manager->environment;
+
+        if (!(final_env = strv_env_merge(2,
+                                         s->meta.manager->environment,
+                                         our_env,
+                                         NULL))) {
+                r = -ENOMEM;
+                goto fail;
+        }

 
         r = exec_spawn(c,
                        argv,
                        &s->exec_context,
                        fds, n_fds,
 
         r = exec_spawn(c,
                        argv,
                        &s->exec_context,
                        fds, n_fds,

-                       env,
+                       final_env,

                        apply_permissions,
                        apply_chroot,
                        apply_permissions,
                        apply_chroot,

+                       apply_tty_stdin,

                        s->meta.manager->confirm_spawn,
                        s->meta.cgroup_bondings,
                        &pid);
 
                        s->meta.manager->confirm_spawn,
                        s->meta.cgroup_bondings,
                        &pid);
 

-        strv_free(argv);
-        argv = NULL;
-
-        if (set_notify_socket)
-                strv_free(env);
-        env = NULL;
-

         if (r < 0)
                 goto fail;
 
         if (r < 0)
                 goto fail;
 

-        if (fdsbuf)
-                free(fdsbuf);

 
         if ((r = unit_watch_pid(UNIT(s), pid)) < 0)
                 /* FIXME: we need to do something here */
                 goto fail;
 
 
         if ((r = unit_watch_pid(UNIT(s), pid)) < 0)
                 /* FIXME: we need to do something here */
                 goto fail;
 

+        free(fdsbuf);
+        strv_free(argv);
+        strv_free(our_env);
+        strv_free(final_env);
+

         *_pid = pid;
 
         return 0;
 
 fail:
         *_pid = pid;
 
         return 0;
 
 fail:

-        free(fds);
-
+        free(fdsbuf);

         strv_free(argv);
         strv_free(argv);

-
-        if (set_notify_socket)
-                strv_free(env);
+        strv_free(our_env);
+        strv_free(final_env);

 
         if (timeout)
                 unit_unwatch_timer(UNIT(s), &s->timer_watch);
 
         if (timeout)
                 unit_unwatch_timer(UNIT(s), &s->timer_watch);


@@ -1504,6 +1521,7 @@ static void service_enter_stop_post(Service *s, bool success) {
                                        false,
                                        !s->permissions_start_only,
                                        !s->root_directory_start_only,
                                        false,
                                        !s->permissions_start_only,
                                        !s->root_directory_start_only,

+                                       true,

                                        false,
                                        &s->control_pid)) < 0)
                         goto fail;
                                        false,
                                        &s->control_pid)) < 0)
                         goto fail;


@@ -1529,10 +1547,10 @@ static void service_enter_signal(Service *s, ServiceState state, bool success) {
         if (!success)
                 s->failure = true;
 
         if (!success)
                 s->failure = true;
 

-        if (s->kill_mode != KILL_NONE) {
-                int sig = (state == SERVICE_STOP_SIGTERM || state == SERVICE_FINAL_SIGTERM) ? SIGTERM : SIGKILL;
+        if (s->exec_context.kill_mode != KILL_NONE) {
+                int sig = (state == SERVICE_STOP_SIGTERM || state == SERVICE_FINAL_SIGTERM) ? s->exec_context.kill_signal : SIGKILL;

 
 

-                if (s->kill_mode == KILL_CONTROL_GROUP) {
+                if (s->exec_context.kill_mode == KILL_CONTROL_GROUP) {

 
                         if ((r = cgroup_bonding_kill_list(s->meta.cgroup_bondings, sig)) < 0) {
                                 if (r != -EAGAIN && r != -ESRCH)
 
                         if ((r = cgroup_bonding_kill_list(s->meta.cgroup_bondings, sig)) < 0) {
                                 if (r != -EAGAIN && r != -ESRCH)


@@ -1545,14 +1563,14 @@ static void service_enter_signal(Service *s, ServiceState state, bool success) {
                         r = 0;
 
                         if (s->main_pid > 0) {
                         r = 0;
 
                         if (s->main_pid > 0) {

-                                if (kill(s->kill_mode == KILL_PROCESS ? s->main_pid : -s->main_pid, sig) < 0 && errno != ESRCH)
+                                if (kill(s->exec_context.kill_mode == KILL_PROCESS ? s->main_pid : -s->main_pid, sig) < 0 && errno != ESRCH)

                                         r = -errno;
                                 else
                                         sent = true;
                         }
 
                         if (s->control_pid > 0) {
                                         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)
+                                if (kill(s->exec_context.kill_mode == KILL_PROCESS ? s->control_pid : -s->control_pid, sig) < 0 && errno != ESRCH)

                                         r = -errno;
                                 else
                                         sent = true;
                                         r = -errno;
                                 else
                                         sent = true;


@@ -1604,6 +1622,7 @@ static void service_enter_stop(Service *s, bool success) {
                                        !s->permissions_start_only,
                                        !s->root_directory_start_only,
                                        false,
                                        !s->permissions_start_only,
                                        !s->root_directory_start_only,
                                        false,

+                                       false,

                                        &s->control_pid)) < 0)
                         goto fail;
 
                                        &s->control_pid)) < 0)
                         goto fail;
 


@@ -1652,6 +1671,7 @@ static void service_enter_start_post(Service *s) {
                                        !s->permissions_start_only,
                                        !s->root_directory_start_only,
                                        false,
                                        !s->permissions_start_only,
                                        !s->root_directory_start_only,
                                        false,

+                                       false,

                                        &s->control_pid)) < 0)
                         goto fail;
 
                                        &s->control_pid)) < 0)
                         goto fail;
 


@@ -1686,6 +1706,7 @@ static void service_enter_start(Service *s) {
                                true,
                                true,
                                true,
                                true,
                                true,
                                true,

+                               true,

                                s->notify_access != NOTIFY_NONE,
                                &pid)) < 0)
                 goto fail;
                                s->notify_access != NOTIFY_NONE,
                                &pid)) < 0)
                 goto fail;


@@ -1746,6 +1767,7 @@ static void service_enter_start_pre(Service *s) {
                                        false,
                                        !s->permissions_start_only,
                                        !s->root_directory_start_only,
                                        false,
                                        !s->permissions_start_only,
                                        !s->root_directory_start_only,

+                                       true,

                                        false,
                                        &s->control_pid)) < 0)
                         goto fail;
                                        false,
                                        &s->control_pid)) < 0)
                         goto fail;


@@ -1763,20 +1785,24 @@ fail:
 
 static void service_enter_restart(Service *s) {
         int r;
 
 static void service_enter_restart(Service *s) {
         int r;

+        DBusError error;
+

         assert(s);
         assert(s);

+        dbus_error_init(&error);

 
         service_enter_dead(s, true, false);
 
 
         service_enter_dead(s, true, false);
 

-        if ((r = manager_add_job(s->meta.manager, JOB_START, UNIT(s), JOB_FAIL, false, NULL)) < 0)
+        if ((r = manager_add_job(s->meta.manager, JOB_START, UNIT(s), JOB_FAIL, false, NULL, NULL)) < 0)

                 goto fail;
 
         log_debug("%s scheduled restart job.", s->meta.id);
         return;
 
 fail:
                 goto fail;
 
         log_debug("%s scheduled restart job.", s->meta.id);
         return;
 
 fail:

-
-        log_warning("%s failed to schedule restart job: %s", s->meta.id, strerror(-r));
+        log_warning("%s failed to schedule restart job: %s", s->meta.id, bus_error(&error, -r));

         service_enter_dead(s, false, false);
         service_enter_dead(s, false, false);

+
+        dbus_error_free(&error);

 }
 
 static void service_enter_reload(Service *s) {
 }
 
 static void service_enter_reload(Service *s) {


@@ -1795,6 +1821,7 @@ static void service_enter_reload(Service *s) {
                                        !s->permissions_start_only,
                                        !s->root_directory_start_only,
                                        false,
                                        !s->permissions_start_only,
                                        !s->root_directory_start_only,
                                        false,

+                                       false,

                                        &s->control_pid)) < 0)
                         goto fail;
 
                                        &s->control_pid)) < 0)
                         goto fail;
 


@@ -1829,6 +1856,8 @@ static void service_run_next(Service *s, bool success) {
                                false,
                                !s->permissions_start_only,
                                !s->root_directory_start_only,
                                false,
                                !s->permissions_start_only,
                                !s->root_directory_start_only,

+                               s->control_command_id == SERVICE_EXEC_START_PRE ||
+                               s->control_command_id == SERVICE_EXEC_STOP_POST,

                                false,
                                &s->control_pid)) < 0)
                 goto fail;
                                false,
                                &s->control_pid)) < 0)
                 goto fail;


@@ -1877,6 +1906,14 @@ static int service_start(Unit *u) {
                 return -ECANCELED;
         }
 
                 return -ECANCELED;
         }
 

+        if ((s->exec_context.std_input == EXEC_INPUT_SOCKET ||
+             s->exec_context.std_output == EXEC_OUTPUT_SOCKET ||
+             s->exec_context.std_error == EXEC_OUTPUT_SOCKET) &&
+            s->socket_fd < 0) {
+                log_warning("%s can only be started with a per-connection socket.", u->meta.id);
+                return -EINVAL;
+        }
+

         s->failure = false;
         s->main_pid_known = false;
         s->allow_restart = true;
         s->failure = false;
         s->main_pid_known = false;
         s->allow_restart = true;


@@ -1890,12 +1927,9 @@ static int service_stop(Unit *u) {
 
         assert(s);
 
 
         assert(s);
 

-        /* Cannot do this now */
-        if (s->state == SERVICE_START_PRE ||
-            s->state == SERVICE_START ||
-            s->state == SERVICE_START_POST ||
-            s->state == SERVICE_RELOAD)
-                return -EAGAIN;
+        /* This is a user request, so don't do restarts on this
+         * shutdown. */
+        s->allow_restart = false;

 
         /* Already on it */
         if (s->state == SERVICE_STOP ||
 
         /* Already on it */
         if (s->state == SERVICE_STOP ||


@@ -1906,16 +1940,24 @@ static int service_stop(Unit *u) {
             s->state == SERVICE_FINAL_SIGKILL)
                 return 0;
 
             s->state == SERVICE_FINAL_SIGKILL)
                 return 0;
 

+        /* Don't allow a restart */

         if (s->state == SERVICE_AUTO_RESTART) {
                 service_set_state(s, SERVICE_DEAD);
                 return 0;
         }
 
         if (s->state == SERVICE_AUTO_RESTART) {
                 service_set_state(s, SERVICE_DEAD);
                 return 0;
         }
 

-        assert(s->state == SERVICE_RUNNING || s->state == SERVICE_EXITED);
+        /* If there's already something running we go directly into
+         * kill mode. */
+        if (s->state == SERVICE_START_PRE ||
+            s->state == SERVICE_START ||
+            s->state == SERVICE_START_POST ||
+            s->state == SERVICE_RELOAD) {
+                service_enter_signal(s, SERVICE_STOP_SIGTERM, true);
+                return 0;
+        }

 
 

-        /* This is a user request, so don't do restarts on this
-         * shutdown. */
-        s->allow_restart = false;
+        assert(s->state == SERVICE_RUNNING ||
+               s->state == SERVICE_EXITED);

 
         service_enter_stop(s, true);
         return 0;
 
         service_enter_stop(s, true);
         return 0;


@@ -2086,28 +2128,28 @@ static int service_deserialize_item(Unit *u, const char *key, const char *value,
         } else if (streq(key, "main-exec-status-start-realtime")) {
                 uint64_t k;
 
         } else if (streq(key, "main-exec-status-start-realtime")) {
                 uint64_t k;
 

-                if ((r = safe_atollu(value, &k)) < 0)
+                if ((r = safe_atou64(value, &k)) < 0)

                         log_debug("Failed to parse main-exec-status-start-realtime value %s", value);
                 else
                         s->main_exec_status.start_timestamp.realtime = (usec_t) k;
         } else if (streq(key, "main-exec-status-start-monotonic")) {
                 uint64_t k;
 
                         log_debug("Failed to parse main-exec-status-start-realtime value %s", value);
                 else
                         s->main_exec_status.start_timestamp.realtime = (usec_t) k;
         } else if (streq(key, "main-exec-status-start-monotonic")) {
                 uint64_t k;
 

-                if ((r = safe_atollu(value, &k)) < 0)
+                if ((r = safe_atou64(value, &k)) < 0)

                         log_debug("Failed to parse main-exec-status-start-monotonic value %s", value);
                 else
                         s->main_exec_status.start_timestamp.monotonic = (usec_t) k;
         } else if (streq(key, "main-exec-status-exit-realtime")) {
                 uint64_t k;
 
                         log_debug("Failed to parse main-exec-status-start-monotonic value %s", value);
                 else
                         s->main_exec_status.start_timestamp.monotonic = (usec_t) k;
         } else if (streq(key, "main-exec-status-exit-realtime")) {
                 uint64_t k;
 

-                if ((r = safe_atollu(value, &k)) < 0)
+                if ((r = safe_atou64(value, &k)) < 0)

                         log_debug("Failed to parse main-exec-status-exit-realtime value %s", value);
                 else
                         s->main_exec_status.exit_timestamp.realtime = (usec_t) k;
         } else if (streq(key, "main-exec-status-exit-monotonic")) {
                 uint64_t k;
 
                         log_debug("Failed to parse main-exec-status-exit-realtime value %s", value);
                 else
                         s->main_exec_status.exit_timestamp.realtime = (usec_t) k;
         } else if (streq(key, "main-exec-status-exit-monotonic")) {
                 uint64_t k;
 

-                if ((r = safe_atollu(value, &k)) < 0)
+                if ((r = safe_atou64(value, &k)) < 0)

                         log_debug("Failed to parse main-exec-status-exit-monotonic value %s", value);
                 else
                         s->main_exec_status.exit_timestamp.monotonic = (usec_t) k;
                         log_debug("Failed to parse main-exec-status-exit-monotonic value %s", value);
                 else
                         s->main_exec_status.exit_timestamp.monotonic = (usec_t) k;


@@ -2153,7 +2195,6 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) {
         assert(pid >= 0);
 
         success = is_clean_exit(code, status);
         assert(pid >= 0);
 
         success = is_clean_exit(code, status);

-        s->failure = s->failure || !success;

 
         if (s->main_pid == pid) {
 
 
         if (s->main_pid == pid) {
 


@@ -2163,9 +2204,14 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) {
                 if (s->type != SERVICE_FORKING) {
                         assert(s->exec_command[SERVICE_EXEC_START]);
                         s->exec_command[SERVICE_EXEC_START]->exec_status = s->main_exec_status;
                 if (s->type != SERVICE_FORKING) {
                         assert(s->exec_command[SERVICE_EXEC_START]);
                         s->exec_command[SERVICE_EXEC_START]->exec_status = s->main_exec_status;

+
+                        if (s->exec_command[SERVICE_EXEC_START]->ignore)
+                                success = true;

                 }
 
                 }
 

-                log_debug("%s: main process exited, code=%s, status=%i", u->meta.id, sigchld_code_to_string(code), status);
+                log_full(success ? LOG_DEBUG : LOG_NOTICE,
+                         "%s: main process exited, code=%s, status=%i", u->meta.id, sigchld_code_to_string(code), status);
+                s->failure = s->failure || !success;

 
                 /* The service exited, so the service is officially
                  * gone. */
 
                 /* The service exited, so the service is officially
                  * gone. */


@@ -2212,12 +2258,18 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) {
 
         } else if (s->control_pid == pid) {
 
 
         } else if (s->control_pid == pid) {
 

-                if (s->control_command)
+                if (s->control_command) {

                         exec_status_exit(&s->control_command->exec_status, pid, code, status);
 
                         exec_status_exit(&s->control_command->exec_status, pid, code, status);
 

+                        if (s->control_command->ignore)
+                                success = true;
+                }
+

                 s->control_pid = 0;
 
                 s->control_pid = 0;
 

-                log_debug("%s: control process exited, code=%s status=%i", u->meta.id, sigchld_code_to_string(code), status);
+                log_full(success ? LOG_DEBUG : LOG_NOTICE,
+                         "%s: control process exited, code=%s status=%i", u->meta.id, sigchld_code_to_string(code), status);
+                s->failure = s->failure || !success;

 
                 /* If we are shutting things down anyway we
                  * don't care about failing commands. */
 
                 /* If we are shutting things down anyway we
                  * don't care about failing commands. */


@@ -2375,7 +2427,7 @@ static void service_timer_event(Unit *u, uint64_t elapsed, Watch* w) {
                 break;
 
         case SERVICE_AUTO_RESTART:
                 break;
 
         case SERVICE_AUTO_RESTART:

-                log_debug("%s holdoff time over, scheduling restart.", u->meta.id);
+                log_info("%s holdoff time over, scheduling restart.", u->meta.id);

                 service_enter_restart(s);
                 break;
 
                 service_enter_restart(s);
                 break;
 


@@ -2436,7 +2488,7 @@ static void service_notify_message(Unit *u, pid_t pid, char **tags) {
              s->state == SERVICE_RELOAD)) {
 
                 if (parse_pid(e + 8, &pid) < 0)
              s->state == SERVICE_RELOAD)) {
 
                 if (parse_pid(e + 8, &pid) < 0)

-                        log_warning("Failed to parse %s", e);
+                        log_warning("Failed to parse notification message %s", e);

                 else {
                         log_debug("%s: got %s", u->meta.id, e);
                         service_set_main_pid(s, pid);
                 else {
                         log_debug("%s: got %s", u->meta.id, e);
                         service_set_main_pid(s, pid);


@@ -2538,7 +2590,7 @@ static int service_enumerate(Manager *m) {
                                         goto finish;
                                 }
 
                                         goto finish;
                                 }
 

-                                if ((r = manager_load_unit_prepare(m, name, NULL, &service)) < 0) {
+                                if ((r = manager_load_unit_prepare(m, name, NULL, NULL, &service)) < 0) {

                                         log_warning("Failed to prepare unit %s: %s", name, strerror(-r));
                                         continue;
                                 }
                                         log_warning("Failed to prepare unit %s: %s", name, strerror(-r));
                                         continue;
                                 }


@@ -2551,6 +2603,13 @@ static int service_enumerate(Manager *m) {
                                 manager_dispatch_load_queue(m);
                                 service = unit_follow_merge(service);
 
                                 manager_dispatch_load_queue(m);
                                 service = unit_follow_merge(service);
 

+                                /* If this is a native service, rely
+                                 * on native ways to pull in a
+                                 * service, don't pull it in via sysv
+                                 * rcN.d links. */
+                                if (service->meta.fragment_path)
+                                        continue;
+

                                 if (de->d_name[0] == 'S') {
 
                                         if ((r = unit_add_two_dependencies_by_name_inverse(service, UNIT_AFTER, UNIT_WANTS, rcnd_table[i].target, NULL, true)) < 0)
                                 if (de->d_name[0] == 'S') {
 
                                         if ((r = unit_add_two_dependencies_by_name_inverse(service, UNIT_AFTER, UNIT_WANTS, rcnd_table[i].target, NULL, true)) < 0)


@@ -2685,6 +2744,17 @@ int service_set_socket_fd(Service *s, int fd, Socket *sock) {
         return 0;
 }
 
         return 0;
 }
 

+static void service_reset_maintenance(Unit *u) {
+        Service *s = SERVICE(u);
+
+        assert(s);
+
+        if (s->state == SERVICE_MAINTENANCE)
+                service_set_state(s, SERVICE_DEAD);
+
+        s->failure = false;
+}
+

 static const char* const service_state_table[_SERVICE_STATE_MAX] = {
         [SERVICE_DEAD] = "dead",
         [SERVICE_START_PRE] = "start-pre",
 static const char* const service_state_table[_SERVICE_STATE_MAX] = {
         [SERVICE_DEAD] = "dead",
         [SERVICE_START_PRE] = "start-pre",


@@ -2772,6 +2842,8 @@ const UnitVTable service_vtable = {
         .sigchld_event = service_sigchld_event,
         .timer_event = service_timer_event,
 
         .sigchld_event = service_sigchld_event,
         .timer_event = service_timer_event,
 

+        .reset_maintenance = service_reset_maintenance,
+

         .cgroup_notify_empty = service_cgroup_notify_event,
         .notify_message = service_notify_message,
 
         .cgroup_notify_empty = service_cgroup_notify_event,
         .notify_message = service_notify_message,