diff options
| author | Kay Sievers <kay@vrfy.org> | 2013-08-15 18:35:03 +0200 |
|---|---|---|
| committer | Kay Sievers <kay@vrfy.org> | 2013-08-15 18:43:31 +0200 |
| commit | 04bf3c1a60d82791e0320381e9268f727708f776 (patch) | |
| tree | 04de5b967af9ed9d8957ce4c5b781ee3a189ffef /src/sysctl | |
| parent | de562e00feb773ea9cb01b1aa6a377409fc90611 (diff) | |
| download | systemd-04bf3c1a60d82791e0320381e9268f727708f776.tar.gz | |
sysctl: allow overwriting of values specified in "later" files
Diffstat (limited to 'src/sysctl')
| -rw-r--r-- | src/sysctl/sysctl.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/src/sysctl/sysctl.c b/src/sysctl/sysctl.c index db18dd9f6e..b5670dbb86 100644 --- a/src/sysctl/sysctl.c +++ b/src/sysctl/sysctl.c @@ -135,6 +135,7 @@ static int parse_file(Hashmap *sysctl_options, const char *path, bool ignore_eno log_debug("parse: %s\n", path); while (!feof(f)) { char l[LINE_MAX], *p, *value, *new_value, *property, *existing; + void *v; int k; if (!fgets(l, sizeof(l), f)) { @@ -167,13 +168,14 @@ static int parse_file(Hashmap *sysctl_options, const char *path, bool ignore_eno p = normalize_sysctl(strstrip(p)); value = strstrip(value); - existing = hashmap_get(sysctl_options, p); + existing = hashmap_get2(sysctl_options, p, &v); if (existing) { - if (!streq(value, existing)) - log_warning("Duplicate assignment of %s in file '%s', ignoring.", - p, path); + if (streq(value, existing)) + continue; - continue; + log_info("Overwriting earlier assignment of %s in file '%s'.", p, path); + free(hashmap_remove(sysctl_options, p)); + free(v); } property = strdup(p); @@ -188,7 +190,7 @@ static int parse_file(Hashmap *sysctl_options, const char *path, bool ignore_eno k = hashmap_put(sysctl_options, property, new_value); if (k < 0) { - log_error("Failed to add sysctl variable %s to hashmap: %s", property, strerror(-r)); + log_error("Failed to add sysctl variable %s to hashmap: %s", property, strerror(-k)); free(property); free(new_value); return k; @@ -304,8 +306,6 @@ int main(int argc, char *argv[]) { goto finish; } - r = parse_file(sysctl_options, "/etc/sysctl.conf", true); - STRV_FOREACH(f, files) { k = parse_file(sysctl_options, *f, true); if (k < 0 && r == 0) |