From bf3bd598136397b5371188bcdec0127e56a1db9a Mon Sep 17 00:00:00 2001 From: Francois Gervais Date: Mon, 12 Apr 2021 18:25:29 -0400 Subject: [PATCH] load-fragment: parse specifiers in CPUAffinity= (#19281) (cherry picked from commit 54cfe9a75f0e84d0604d39b87b1d919542336809) --- src/core/load-fragment.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c index 6d3bbd4a39..6da623dbda 100644 --- a/src/core/load-fragment.c +++ b/src/core/load-fragment.c @@ -1695,6 +1695,8 @@ int config_parse_exec_cpu_affinity( void *userdata) { ExecContext *c = data; + const Unit *u = userdata; + _cleanup_free_ char *k = NULL; int r; assert(filename); @@ -1709,7 +1711,15 @@ int config_parse_exec_cpu_affinity( return 0; } - r = parse_cpu_set_extend(rvalue, &c->cpu_set, true, unit, filename, line, lvalue); + r = unit_full_printf(u, rvalue, &k); + if (r < 0) { + log_syntax(unit, LOG_WARNING, filename, line, r, + "Failed to resolve unit specifiers in '%s', ignoring: %m", + rvalue); + return 0; + } + + r = parse_cpu_set_extend(k, &c->cpu_set, true, unit, filename, line, lvalue); if (r >= 0) c->cpu_affinity_from_numa = false; -- 2.25.1