[systemd-commits] src/core

[Lennart Poettering]

 src/core/service.c |    9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

New commits:
commit d4943dc7559dff51d4d3bb737232b9328d6726e1
Author: Lennart Poettering <lennart at poettering.net>
Date:   Wed Jul 18 02:42:43 2012 +0200

    service: don't print a warning if we are in autorestart state, and can't start a unit just yet

diff --git a/src/core/service.c b/src/core/service.c
index cf480ab..5dc06b3 100644
--- a/src/core/service.c
+++ b/src/core/service.c
@@ -2476,11 +2476,12 @@ static int service_start(Unit *u) {
         /* A service that will be restarted must be stopped first to
          * trigger BindsTo and/or OnFailure dependencies. If a user
          * does not want to wait for the holdoff time to elapse, the
-         * service should be manually restarted, not started. */
-        if (s->state == SERVICE_AUTO_RESTART) {
-                log_warning("%s automatic restart is pending, must be stopped before issuing start request.", UNIT(s)->id);
+         * service should be manually restarted, not started. We
+         * simply return EAGAIN here, so that any start jobs stay
+         * queued, and assume that the auto restart timer will
+         * eventually trigger the restart. */
+        if (s->state == SERVICE_AUTO_RESTART)
                 return -EAGAIN;
-        }
 
         assert(s->state == SERVICE_DEAD || s->state == SERVICE_FAILED);