[systemd-commits] src/sysctl

[Dave Reisner]

 src/sysctl/sysctl.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

New commits:
commit 1a3f40f912670d3dea3811a4560b368412090b81
Author: Dave Reisner <dreisner at archlinux.org>
Date:   Sat Oct 6 16:32:17 2012 -0400

    sysctl: avoiding exiting with error on -EEXIST
    
    If the final key in any sysctl.d file is a duplicate, systemd-sysctl
    will exit with an error (and no explaination why). Ignore this, as
    duplicate keys are to be expected when overriding settings in the
    directory hierarchy.

diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c
index e77f496..a68d67f 100644
--- a/src/sysctl/sysctl.c
+++ b/src/sysctl/sysctl.c
@@ -167,9 +167,13 @@ static int parse_file(const char *path, bool ignore_enoent) {
 
                 r = hashmap_put(sysctl_options, property, new_value);
                 if (r < 0) {
-                        if (r == -EEXIST)
+                        if (r == -EEXIST) {
+                                /* ignore this "error" to avoid returning it
+                                 * for the function when this is the last key
+                                 * in the file being parsed. */
+                                r = 0;
                                 log_debug("Skipping previously assigned sysctl variable %s", property);
-                        else
+                        } else
                                 log_error("Failed to add sysctl variable %s to hashmap: %s", property, strerror(-r));
 
                         free(property);