diff options
| author | Lennart Poettering <lennart@poettering.net> | 2020-06-09 20:06:18 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-09 20:06:18 +0200 |
| commit | 9558e85fbee62701add31208e96dd105a820fb24 (patch) | |
| tree | 419f4639148f7c1ff8e6597af8ff26624dcd6580 /src/core/load-fragment.c | |
| parent | d689f0f20aba32fd1b99330f032a6a343d0e2ab5 (diff) | |
| download | systemd-9558e85fbee62701add31208e96dd105a820fb24.tar.gz | |
Revert "Fix memory protection default setting"revert-16058-fix-memory-protection-default
Diffstat (limited to 'src/core/load-fragment.c')
| -rw-r--r-- | src/core/load-fragment.c | 22 |
1 files changed, 10 insertions, 12 deletions
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c index c1a4eb96cb..a2eede4cce 100644 --- a/src/core/load-fragment.c +++ b/src/core/load-fragment.c @@ -3372,12 +3372,6 @@ int config_parse_memory_limit( uint64_t bytes = CGROUP_LIMIT_MAX; int r; - if (STR_IN_SET(lvalue, "DefaultMemoryLow", - "DefaultMemoryMin", - "MemoryLow", - "MemoryMin")) - bytes = CGROUP_LIMIT_MIN; - if (!isempty(rvalue) && !streq(rvalue, "infinity")) { r = parse_permille(rvalue); @@ -3397,20 +3391,24 @@ int config_parse_memory_limit( } } - /* Keep Memory{Low,Min} unset with empty assignment so that we fall back to DefaultMemory* which in - * contrast means zeroing the property. */ if (streq(lvalue, "DefaultMemoryLow")) { - c->default_memory_low = bytes; c->default_memory_low_set = true; + if (isempty(rvalue)) + c->default_memory_low = CGROUP_LIMIT_MIN; + else + c->default_memory_low = bytes; } else if (streq(lvalue, "DefaultMemoryMin")) { - c->default_memory_min = bytes; c->default_memory_min_set = true; + if (isempty(rvalue)) + c->default_memory_min = CGROUP_LIMIT_MIN; + else + c->default_memory_min = bytes; } else if (streq(lvalue, "MemoryMin")) { c->memory_min = bytes; - c->memory_min_set = !isempty(rvalue); + c->memory_min_set = true; } else if (streq(lvalue, "MemoryLow")) { c->memory_low = bytes; - c->memory_low_set = !isempty(rvalue); + c->memory_low_set = true; } else if (streq(lvalue, "MemoryHigh")) c->memory_high = bytes; else if (streq(lvalue, "MemoryMax")) |