From ff3b2d707bd1a47ed1594029d2372f880a04d63c Mon Sep 17 00:00:00 2001
From: Lennart Poettering <lennart@poettering.net>
Date: Fri, 21 Sep 2012 17:01:39 +0200
Subject: [PATCH] sysctl: always return the last error we encountered (cherry
picked from commit
0187f62bb5f785c22952e79c55ef0fdb87f1ad65)
---
src/sysctl/sysctl.c | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c
index 961b29b..be03f78 100644
--- a/src/sysctl/sysctl.c
+++ b/src/sysctl/sysctl.c
@@ -256,7 +256,7 @@ static int parse_argv(int argc, char *argv[]) {
}
int main(int argc, char *argv[]) {
- int r = 0;
+ int r = 0, k;
char *property, *value;
Iterator it;
@@ -264,8 +264,6 @@ int main(int argc, char *argv[]) {
if (r <= 0)
return r < 0 ? EXIT_FAILURE : EXIT_SUCCESS;
- r = 0;
-
log_set_target(LOG_TARGET_AUTO);
log_parse_environment();
log_open();
@@ -278,19 +276,18 @@ int main(int argc, char *argv[]) {
goto finish;
}
+ r = 0;
+
if (argc > optind) {
int i;
for (i = optind; i < argc; i++) {
- int k;
-
k = parse_file(argv[i], false);
- if (k < 0 && r == 0)
+ if (k < 0)
r = k;
}
} else {
char **files, **f;
- int k;
r = conf_files_list(&files, ".conf",
"/etc/sysctl.d",
@@ -314,14 +311,17 @@ int main(int argc, char *argv[]) {
f = files + strv_length(files) - 1;
STRV_FOREACH_BACKWARDS(f, files) {
k = parse_file(*f, true);
- if (k < 0 && r == 0)
+ if (k < 0)
r = k;
}
strv_free(files);
}
- r = apply_all();
+ k = apply_all();
+ if (k < 0)
+ r = k;
+
finish:
HASHMAP_FOREACH_KEY(value, property, sysctl_options, it) {
hashmap_remove(sysctl_options, property);