|
 |
c2dfb7 |
From 6ecf0a945d6d4187995de7e79e3ed75f4827289a Mon Sep 17 00:00:00 2001
|
|
|
c2dfb7 |
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
|
|
c2dfb7 |
Date: Sun, 24 Nov 2019 14:14:43 +0100
|
|
|
c2dfb7 |
Subject: [PATCH] pid1: fix the names of AllowedCPUs= and AllowedMemoryNodes=
|
|
|
c2dfb7 |
|
|
|
c2dfb7 |
The original PR was submitted with CPUSetCpus and CPUSetMems, which was later
|
|
|
c2dfb7 |
changed to AllowedCPUs and AllowedMemmoryNodes everywhere (including the parser
|
|
|
c2dfb7 |
used by systemd-run), but not in the parser for unit files.
|
|
|
c2dfb7 |
|
|
|
c2dfb7 |
Since we already released -rc1, let's keep support for the old names. I think
|
|
|
c2dfb7 |
we can remove it in a release or two if anyone remembers to do that.
|
|
|
c2dfb7 |
|
|
|
c2dfb7 |
Fixes #14126. Follow-up for 047f5d63d7a1ab75073f8485e2f9b550d25b0772.
|
|
|
c2dfb7 |
|
|
|
c2dfb7 |
(cherry picked from commit 0b8d3075872a05e0449906d24421ce192f50c29f)
|
|
|
c2dfb7 |
|
|
|
c2dfb7 |
Related: #1818054
|
|
|
c2dfb7 |
---
|
|
|
c2dfb7 |
src/core/load-fragment-gperf.gperf.m4 | 4 ++--
|
|
|
c2dfb7 |
src/core/load-fragment.c | 4 ++--
|
|
|
c2dfb7 |
src/core/load-fragment.h | 4 ++--
|
|
|
c2dfb7 |
3 files changed, 6 insertions(+), 6 deletions(-)
|
|
|
c2dfb7 |
|
|
|
c2dfb7 |
diff --git a/src/core/load-fragment-gperf.gperf.m4 b/src/core/load-fragment-gperf.gperf.m4
|
|
|
c2dfb7 |
index ebb44df487..161c5a2c82 100644
|
|
|
c2dfb7 |
--- a/src/core/load-fragment-gperf.gperf.m4
|
|
|
c2dfb7 |
+++ b/src/core/load-fragment-gperf.gperf.m4
|
|
|
c2dfb7 |
@@ -161,14 +161,14 @@ $1.KillSignal, config_parse_signal, 0,
|
|
|
c2dfb7 |
)m4_dnl
|
|
|
c2dfb7 |
m4_define(`CGROUP_CONTEXT_CONFIG_ITEMS',
|
|
|
c2dfb7 |
`$1.Slice, config_parse_unit_slice, 0, 0
|
|
|
c2dfb7 |
+$1.AllowedCPUs, config_parse_allowed_cpus, 0, offsetof($1, cgroup_context)
|
|
|
c2dfb7 |
+$1.AllowedMemoryNodes, config_parse_allowed_mems, 0, offsetof($1, cgroup_context)
|
|
|
c2dfb7 |
$1.CPUAccounting, config_parse_bool, 0, offsetof($1, cgroup_context.cpu_accounting)
|
|
|
c2dfb7 |
$1.CPUWeight, config_parse_cg_weight, 0, offsetof($1, cgroup_context.cpu_weight)
|
|
|
c2dfb7 |
$1.StartupCPUWeight, config_parse_cg_weight, 0, offsetof($1, cgroup_context.startup_cpu_weight)
|
|
|
c2dfb7 |
$1.CPUShares, config_parse_cpu_shares, 0, offsetof($1, cgroup_context.cpu_shares)
|
|
|
c2dfb7 |
$1.StartupCPUShares, config_parse_cpu_shares, 0, offsetof($1, cgroup_context.startup_cpu_shares)
|
|
|
c2dfb7 |
$1.CPUQuota, config_parse_cpu_quota, 0, offsetof($1, cgroup_context)
|
|
|
c2dfb7 |
-$1.CPUSetCpus, config_parse_cpuset_cpus, 0, offsetof($1, cgroup_context)
|
|
|
c2dfb7 |
-$1.CPUSetMems, config_parse_cpuset_mems, 0, offsetof($1, cgroup_context)
|
|
|
c2dfb7 |
$1.MemoryAccounting, config_parse_bool, 0, offsetof($1, cgroup_context.memory_accounting)
|
|
|
c2dfb7 |
$1.MemoryLow, config_parse_memory_limit, 0, offsetof($1, cgroup_context)
|
|
|
c2dfb7 |
$1.MemoryHigh, config_parse_memory_limit, 0, offsetof($1, cgroup_context)
|
|
|
c2dfb7 |
diff --git a/src/core/load-fragment.c b/src/core/load-fragment.c
|
|
|
c2dfb7 |
index 6debf82401..2082166afb 100644
|
|
|
c2dfb7 |
--- a/src/core/load-fragment.c
|
|
|
c2dfb7 |
+++ b/src/core/load-fragment.c
|
|
|
c2dfb7 |
@@ -3011,7 +3011,7 @@ int config_parse_cpu_quota(
|
|
|
c2dfb7 |
return 0;
|
|
|
c2dfb7 |
}
|
|
|
c2dfb7 |
|
|
|
c2dfb7 |
-int config_parse_cpuset_cpus(
|
|
|
c2dfb7 |
+int config_parse_allowed_cpus(
|
|
|
c2dfb7 |
const char *unit,
|
|
|
c2dfb7 |
const char *filename,
|
|
|
c2dfb7 |
unsigned line,
|
|
|
c2dfb7 |
@@ -3030,7 +3030,7 @@ int config_parse_cpuset_cpus(
|
|
|
c2dfb7 |
return 0;
|
|
|
c2dfb7 |
}
|
|
|
c2dfb7 |
|
|
|
c2dfb7 |
-int config_parse_cpuset_mems(
|
|
|
c2dfb7 |
+int config_parse_allowed_mems(
|
|
|
c2dfb7 |
const char *unit,
|
|
|
c2dfb7 |
const char *filename,
|
|
|
c2dfb7 |
unsigned line,
|
|
|
c2dfb7 |
diff --git a/src/core/load-fragment.h b/src/core/load-fragment.h
|
|
|
c2dfb7 |
index 6612e1fb32..424fa478a7 100644
|
|
|
c2dfb7 |
--- a/src/core/load-fragment.h
|
|
|
c2dfb7 |
+++ b/src/core/load-fragment.h
|
|
|
c2dfb7 |
@@ -86,8 +86,8 @@ CONFIG_PARSER_PROTOTYPE(config_parse_set_status);
|
|
|
c2dfb7 |
CONFIG_PARSER_PROTOTYPE(config_parse_namespace_path_strv);
|
|
|
c2dfb7 |
CONFIG_PARSER_PROTOTYPE(config_parse_temporary_filesystems);
|
|
|
c2dfb7 |
CONFIG_PARSER_PROTOTYPE(config_parse_cpu_quota);
|
|
|
c2dfb7 |
-CONFIG_PARSER_PROTOTYPE(config_parse_cpuset_cpus);
|
|
|
c2dfb7 |
-CONFIG_PARSER_PROTOTYPE(config_parse_cpuset_mems);
|
|
|
c2dfb7 |
+CONFIG_PARSER_PROTOTYPE(config_parse_allowed_cpus);
|
|
|
c2dfb7 |
+CONFIG_PARSER_PROTOTYPE(config_parse_allowed_mems);
|
|
|
c2dfb7 |
CONFIG_PARSER_PROTOTYPE(config_parse_protect_home);
|
|
|
c2dfb7 |
CONFIG_PARSER_PROTOTYPE(config_parse_protect_system);
|
|
|
c2dfb7 |
CONFIG_PARSER_PROTOTYPE(config_parse_bus_name);
|