From 71e6fb4616f245a60fd5fbfe172cb3e878630355 Mon Sep 17 00:00:00 2001
From: Mike Yuan <me@yhndnzj.com>
Date: Thu, 22 Feb 2024 13:06:44 +0800
Subject: [PATCH 0424/1160] core: mark JoinControllers= as DISABLED_LEGACY
rather than _CONFIGURATION
Follow-up for 143fadf369a18449464956206226761e49be1928
(cherry picked from commit 62b5bd3c8a17bad11cde728b0b592f9936e75648)
src/core/main.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
@@ -627,7 +627,7 @@ static int parse_config_file(void) {
{ "Manager", "CPUAffinity", config_parse_cpu_affinity2, 0, &arg_cpu_affinity },
{ "Manager", "NUMAPolicy", config_parse_numa_policy, 0, &arg_numa_policy.type },
{ "Manager", "NUMAMask", config_parse_numa_mask, 0, &arg_numa_policy },
- { "Manager", "JoinControllers", config_parse_warn_compat, DISABLED_CONFIGURATION, NULL },
+ { "Manager", "JoinControllers", config_parse_warn_compat, DISABLED_LEGACY, NULL },
{ "Manager", "RuntimeWatchdogSec", config_parse_watchdog_sec, 0, &arg_runtime_watchdog },
{ "Manager", "RuntimeWatchdogPreSec", config_parse_watchdog_sec, 0, &arg_pretimeout_watchdog },
{ "Manager", "RebootWatchdogSec", config_parse_watchdog_sec, 0, &arg_reboot_watchdog },
--
2.33.0