shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2025-03-25 18:50:18 +03:00
Code

Merge pull request #8758 from keszybz/improved-slice-checks

Browse Source 
Improved slice checks
This commit is contained in:
Lennart Poettering 2018-04-19 11:28:05 +02:00 committed by GitHub
commit 6360b8ff83
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/core/load-fragment.c
View File

@ -3404,14 +3404,23 @@ int config_parse_delegate(
void *userdata) {
CGroupContext *c = data;
UnitType t;
int r;
t = unit_name_to_type(unit);
assert(t != _UNIT_TYPE_INVALID);
if (!unit_vtable[t]->can_delegate) {
log_syntax(unit, LOG_ERR, filename, line, 0, "Delegate= setting not supported for this unit type, ignoring.");
return 0;
}
/* We either accept a boolean value, which may be used to turn on delegation for all controllers, or turn it
* off for all. Or it takes a list of controller names, in which case we add the specified controllers to the
* mask to delegate. */
if (isempty(rvalue)) {
c->delegate = true;
c->delegate = false;
c->delegate_controllers = 0;
return 0;
}
@ -3432,7 +3441,7 @@ int config_parse_delegate(
return log_oom();
if (r < 0) {
log_syntax(unit, LOG_ERR, filename, line, r, "Invalid syntax, ignoring: %s", rvalue);
return r;
return 0;
}
cc = cgroup_controller_from_string(word);