summaryrefslogtreecommitdiff
path: root/src/basic
diff options
context:
space:
mode:
authorFilipe Brandenburger <filbranden@google.com>2015-09-25 04:45:22 -0700
committerFilipe Brandenburger <filbranden@google.com>2015-10-27 17:39:58 -0700
commit4fc66acb93d6f0002263e2dfaefa46e272ae0c9c (patch)
tree2abd6cf5439be33c6047616ab4948ce3f1b507d9 /src/basic
parentdc1e811ebd80d1659d1476c4ae733d212d6aa946 (diff)
cpu-set-util: Accept commas as separators in parse_cpu_set_and_warn
Tested CPUAffinity settings on both a service unit and in system.conf and confirmed they work as expected. Added a new test to confirm that trailing commas and spaces work and to prevent any regressions in that area.
Diffstat (limited to 'src/basic')
-rw-r--r--src/basic/cpu-set-util.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/basic/cpu-set-util.c b/src/basic/cpu-set-util.c
index 9122ea5d48..441144d5cc 100644
--- a/src/basic/cpu-set-util.c
+++ b/src/basic/cpu-set-util.c
@@ -75,7 +75,7 @@ int parse_cpu_set_and_warn(
unsigned cpu;
int r;
- r = extract_first_word(&rvalue, &word, WHITESPACE, EXTRACT_QUOTES);
+ r = extract_first_word(&rvalue, &word, WHITESPACE ",", EXTRACT_QUOTES);
if (r < 0) {
log_syntax(unit, LOG_ERR, filename, line, r, "Invalid value for %s: %s", lvalue, whole_rvalue);
return r;