28 lines
961 B
Diff
28 lines
961 B
Diff
|
From 3afab028b6bdeadd32e2c87b6f5a64019945358f Mon Sep 17 00:00:00 2001
|
||
|
|
From: Lennart Poettering <lennart@poettering.net>
|
||
|
|
Date: Wed, 2 Oct 2013 19:37:44 +0200
|
||
|
|
Subject: [PATCH] modules-load: fix error handling
|
||
|
|
|
||
|
|
---
|
||
|
|
src/modules-load/modules-load.c | 4 ++--
|
||
|
|
1 file changed, 2 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
diff --git a/src/modules-load/modules-load.c b/src/modules-load/modules-load.c
|
||
|
|
index 7b19ee0..49ee420 100644
|
||
|
|
--- a/src/modules-load/modules-load.c
|
||
|
|
+++ b/src/modules-load/modules-load.c
|
||
|
|
@@ -302,8 +302,8 @@ int main(int argc, char *argv[]) {
|
||
|
|
|
||
|
|
STRV_FOREACH(i, arg_proc_cmdline_modules) {
|
||
|
|
k = load_module(ctx, *i);
|
||
|
|
- if (k < 0)
|
||
|
|
- r = EXIT_FAILURE;
|
||
|
|
+ if (k < 0 && r == 0)
|
||
|
|
+ r = k;
|
||
|
|
}
|
||
|
|
|
||
|
|
r = conf_files_list_nulstr(&files, ".conf", NULL, conf_file_dirs);
|
||
|
|
--
|
||
|
|
1.8.4.652.g0d6e0ce
|
||
|
|
|