don't fail over missing modules

1 files changed, 8 insertions, 7 deletions

diff --git a/loader/modules.c b/loader/modules.c
index 6ebc78f2d..57c040a8e 100644
--- a/loader/modules.c
+++ b/loader/modules.c
@@ -461,23 +461,26 @@ static int doLoadModules(const char * origModNames, moduleList modLoaded,
 	logMessage("no modules found -- aborting insertion\n");
 	i++;
     } else {
+	*items = '\0';
+
 	/* if any modules weren't found, holler */
 	for (l = list, p = paths; *l && p; l++, p++) {
 	    if (!*p) {
-		logMessage("module %s not found -- aborting insertion",
-			   *l);
+		if (*items) strcat(items, " ");
+		strcat(items, *l);
 		i++;
 	    }
 	}
+
+	if (*items) logMessage("modules %s not found", items);
     }
 
     /* insert the modules now */
-    for (l = list, p = paths; !i && *l; l++, p++) {
-	if (loadModule(*l, *p, modLoaded, 
+    for (l = list, p = paths; *l; l++, p++) {
+	if (*p && loadModule(*l, *p, modLoaded, 
 		       (argModule && !strcmp(argModule, *l)) ? args : NULL, 
 		       modInfo, flags)) {
 	    logMessage("failed to insert %s\n", *p);
-	    i++;
 	}
     }
 
@@ -495,8 +498,6 @@ static int doLoadModules(const char * origModNames, moduleList modLoaded,
 	}
     }
 
-    logMessage("wrote modules.conf");
-    
     for (p = paths; *p; p++) {
 	unlink(*p);
 	free(*p);