initd: don't start runsvc for services without exec block

First in rdsvc, tag the services that *do* have exec lines, even if we don't
read them.

Second, if a service does not have that flag set, don't try to execute it.

Signed-off-by: David Oberhollenzer <goliath@infraroot.at>

3 files changed, 13 insertions, 1 deletions

diff --git a/initd/supervisor.c b/initd/supervisor.c
index cd38469..451ad93 100644
--- a/initd/supervisor.c
+++ b/initd/supervisor.c
@@ -156,6 +156,14 @@ bool supervisor_process_queues(void)
 	svc = queue;
 	queue = queue->next;
 
+	if (!(svc->flags & SVC_FLAG_HAS_EXEC)) {
+		print_status(svc->desc, STATUS_OK, false);
+		svc->status = EXIT_SUCCESS;
+		svc->next = completed;
+		completed = svc;
+		goto out;
+	}
+
 	if (start_service(svc) != 0)
 		return true;
 
@@ -171,7 +179,7 @@ bool supervisor_process_queues(void)
 		singleshot += 1;
 		break;
 	}
-
+out:
 	if (singleshot == 0 && queue == NULL && !waiting)
 		target_completed(target);
 	return true;
diff --git a/lib/include/service.h b/lib/include/service.h
index e46cd0e..85b82c5 100644
--- a/lib/include/service.h
+++ b/lib/include/service.h
@@ -41,6 +41,8 @@ enum {
 enum {
 	/* truncate stdout */
 	SVC_FLAG_TRUNCATE_OUT = 0x01,
+
+	SVC_FLAG_HAS_EXEC = 0x10,
 };
 
 typedef struct service_t {
diff --git a/lib/init/rdsvc.c b/lib/init/rdsvc.c
index b86a27b..7ce68e3 100644
--- a/lib/init/rdsvc.c
+++ b/lib/init/rdsvc.c
@@ -81,6 +81,8 @@ static int svc_exec(void *user, char *arg, rdline_t *rd, int flags)
 	service_t *svc = user;
 	exec_t *e, *end;
 
+	svc->flags |= SVC_FLAG_HAS_EXEC;
+
 	if (flags & RDSVC_NO_EXEC)
 		return 0;