Marcus Meissner
622a76aacd
fix acpi memleak. - Add 0002-fix-lingering-references-to-var-lib-backlight-random.patch: fix invalid path in documentation. - Add 0003-acpi-make-sure-we-never-free-an-uninitialized-pointe.patch: fix invalid memory free. - Add 0004-systemctl-fix-name-mangling-for-sysv-units.patch: fix name mangling for sysv units. - Add 0005-cryptsetup-fix-OOM-handling-when-parsing-mount-optio.patch: fix OOM handling. - Add 0006-journald-add-missing-error-check.patch: add missing error check. - Add 0007-bus-fix-potentially-uninitialized-memory-access.patch: fix uninitialized memory access. - Add 0008-dbus-fix-return-value-of-dispatch_rqueue.patch: fix return value. - Add 0009-modules-load-fix-error-handling.patch: fix error handling. - Add 0010-efi-never-call-qsort-on-potentially-NULL-arrays.patch: fix incorrect memory access. - Add 0011-strv-don-t-access-potentially-NULL-string-arrays.patch: fix incorrect memory access. - Add 0012-mkdir-pass-a-proper-function-pointer-to-mkdir_safe_i.patch: fix invalid pointer. - Add 0014-tmpfiles.d-include-setgid-perms-for-run-log-journal.patch: OBS-URL: https://build.opensuse.org/package/show/Base:System/systemd?expand=0&rev=452
28 lines
954 B
Diff
28 lines
954 B
Diff
From b857193b1def5172e3641ca1d5bc9e08ae81aac4 Mon Sep 17 00:00:00 2001
|
|
From: Lennart Poettering <lennart@poettering.net>
|
|
Date: Wed, 2 Oct 2013 19:37:44 +0200
|
|
Subject: [PATCH 09/15] 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
|
|
|