From e0f0fc8046bed6d21a92d0ef6f708d3ce5ef5c1c Mon Sep 17 00:00:00 2001
From: Roy Marples <roy@marples.name>
Date: Tue, 28 Apr 2009 08:29:02 +0000
Subject: Don't start services when their need dependency is broken

---
 src/librc/librc-depend.c | 11 ++++++++++-
 src/rc/runscript.c       |  3 ++-
 2 files changed, 12 insertions(+), 2 deletions(-)

(limited to 'src')

diff --git a/src/librc/librc-depend.c b/src/librc/librc-depend.c
index 45c3dd0..bd67ed9 100644
--- a/src/librc/librc-depend.c
+++ b/src/librc/librc-depend.c
@@ -899,11 +899,20 @@ rc_deptree_update(void)
 			TAILQ_FOREACH(s, deptype->services, entries) {
 				di = get_depinfo(deptree, s->value);
 				if (!di) {
-					if (strcmp(deptype->type, "ineed") == 0)
+					if (strcmp(deptype->type, "ineed") == 0) {
 						fprintf (stderr,
 							 "Service `%s' needs non"
 							 " existant service `%s'\n",
 							 depinfo->service, s->value);
+						dt = get_deptype(depinfo, "broken");
+						if (!dt) {
+							dt = xmalloc(sizeof(*dt));
+							dt->type = xstrdup("broken");
+							dt->services = rc_stringlist_new();
+							TAILQ_INSERT_TAIL(&depinfo->depends, dt, entries);
+						}
+						rc_stringlist_addu(dt->services, s->value);
+					}
 					continue;
 				}
 
diff --git a/src/rc/runscript.c b/src/rc/runscript.c
index b4ce0f8..c2688ee 100644
--- a/src/rc/runscript.c
+++ b/src/rc/runscript.c
@@ -633,7 +633,7 @@ svc_start(bool deps)
 		services = rc_deptree_depends(deptree, types_b, applet_list,
 		    runlevel, 0);
 		if (TAILQ_FIRST(services)) {
-			eerrorn("ERROR: `%s' needs ", applet);
+			eerrorn("ERROR: %s needs service(s) ", applet);
 			first = true;
 			TAILQ_FOREACH(svc, services, entries) {
 				if (first)
@@ -642,6 +642,7 @@ svc_start(bool deps)
 					fprintf(stderr, ", ");
 				fprintf(stderr, "%s", svc->value);
 			}
+			fprintf(stderr, "\n");
 			exit(EXIT_FAILURE);
 		}
 		rc_stringlist_free(services);
-- 
cgit v1.2.3