service: fix segfault

[elogind.git] / service.c

diff --git a/service.c b/service.c
index 2d326be13788465cb92b0cdd2df94cc37f5f9a79..0a70bb0a7c518168c6d7d01375b0930c10fe34e9 100644 (file)
--- a/service.c
+++ b/service.c
@@ -623,6 +623,10 @@ static int service_load_sysv_path(Service *s, const char *path) {
         /* Special setting for all SysV services */
         s->valid_no_process = true;
 
+        /* Don't timeout special services during boot (like fsck) */
+        if (s->sysv_runlevels && !chars_intersect("12345", s->sysv_runlevels))
+                s->timeout_usec = -1;
+
         u->meta.load_state = UNIT_LOADED;
         r = 0;
 
@@ -726,6 +730,20 @@ static void service_init(Unit *u) {
         RATELIMIT_INIT(s->ratelimit, 10*USEC_PER_SEC, 5);
 }
 
+static int service_verify(Service *s) {
+        assert(s);
+
+        if (UNIT(s)->meta.load_state != UNIT_LOADED)
+                return 0;
+
+        if (!s->exec_command[SERVICE_EXEC_START]) {
+                log_error("%s lacks ExecStart setting. Refusing.", unit_id(UNIT(s)));
+                return -EINVAL;
+        }
+
+        return 0;
+}
+
 static int service_load(Unit *u) {
         int r;
         Service *s = SERVICE(u);
@@ -762,7 +780,7 @@ static int service_load(Unit *u) {
                         return r;
         }
 
-        return 0;
+        return service_verify(s);
 }
 
 static void service_dump(Unit *u, FILE *f, const char *prefix) {
@@ -1447,11 +1465,12 @@ static void service_enter_restart(Service *s) {
         int r;
         assert(s);
 
+        service_enter_dead(s, true, false);
+
         if ((r = manager_add_job(UNIT(s)->meta.manager, JOB_START, UNIT(s), JOB_FAIL, false, NULL)) < 0)
                 goto fail;
 
         log_debug("%s scheduled restart job.", unit_id(UNIT(s)));
-        service_enter_dead(s, true, false);
         return;
 
 fail:
@@ -2006,7 +2025,7 @@ 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",
+        [SERVICE_RESTART_ALWAYS] = "restart-always",
 };
 
 DEFINE_STRING_TABLE_LOOKUP(service_restart, ServiceRestart);