service: when we cannot start due to rate limít consider that a real failure

[elogind.git] / src / service.c

diff --git a/src/service.c b/src/service.c
index 2fcb304e86d7bffbcfae02627e6f5a842687d19b..ac83862db770c39e886b8bf44694ecd3edea3835 100644 (file)
--- a/src/service.c
+++ b/src/service.c
@@ -632,11 +632,6 @@ static int service_load_sysv_path(Service *s, const char *path) {
         s->valid_no_process = true;
         s->kill_mode = KILL_PROCESS_GROUP;
 
-        /* For SysV services log output should go to the console */
-        s->exec_context.std_input = EXEC_INPUT_NULL;
-        s->exec_context.std_output = EXEC_OUTPUT_TTY;
-        s->exec_context.std_error = EXEC_OUTPUT_TTY;
-
         u->meta.load_state = UNIT_LOADED;
         r = 0;
 
@@ -1713,7 +1708,7 @@ static int service_start(Unit *u) {
         /* 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.", u->meta.id);
-                return -EAGAIN;
+                return -ECANCELED;
         }
 
         s->failure = false;