shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-19 22:50:17 +03:00
Code

load-modules: properly return a failing error code if some module fails to load

Browse Source 
This is the missing part of b857193b1def5172e3641ca1d5bc9e08ae81aac4.
This commit is contained in:
Lennart Poettering 2014-02-18 21:23:16 +01:00
parent 6bebb0add4
commit 4b462d1a28
Notes: Lennart Poettering 2014-02-18 21:24:49 +01:00 
Backport: bugfix
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/modules-load/modules-load.c
View File

@ -286,9 +286,11 @@ int main(int argc, char *argv[]) {
r = k;
}
r = conf_files_list_nulstr(&files, ".conf", NULL, conf_file_dirs);
if (r < 0) {
log_error("Failed to enumerate modules-load.d files: %s", strerror(-r));
k = conf_files_list_nulstr(&files, ".conf", NULL, conf_file_dirs);
if (k < 0) {
log_error("Failed to enumerate modules-load.d files: %s", strerror(-k));
if (r == 0)
r = k;
goto finish;
}