29 lines
1 KiB
Diff
29 lines
1 KiB
Diff
From dcfb048af5face4787ecdf29c00454898c52963d Mon Sep 17 00:00:00 2001
|
|
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
|
|
Date: Wed, 27 Mar 2013 13:33:09 +0100
|
|
Subject: [PATCH 8/8] systemd-sysctl: Handle missing /etc/sysctl.conf properly
|
|
|
|
Since fabe5c0e5fce730aa66e10a9c4f9fdd443d7aeda, systemd-sysctl returns
|
|
a non-zero exit code if /etc/sysctl.conf does not exist, due to a
|
|
broken ENOENT check.
|
|
---
|
|
src/sysctl/sysctl.c | 2 +-
|
|
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
|
diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c
|
|
index 2d43660..79f3f77 100644
|
|
--- a/src/sysctl/sysctl.c
|
|
+++ b/src/sysctl/sysctl.c
|
|
@@ -125,7 +125,7 @@ static int parse_file(Hashmap *sysctl_options, const char *path, bool ignore_eno
|
|
|
|
r = search_and_fopen_nulstr(path, "re", conf_file_dirs, &f);
|
|
if (r < 0) {
|
|
- if (ignore_enoent && errno == -ENOENT)
|
|
+ if (ignore_enoent && r == -ENOENT)
|
|
return 0;
|
|
|
|
log_error("Failed to open file '%s', ignoring: %s", path, strerror(-r));
|
|
--
|
|
1.8.1
|
|
|