From: Mike Yuan Date: Thu, 22 Feb 2024 05:06:44 +0000 (+0800) Subject: core: mark JoinControllers= as DISABLED_LEGACY rather than _CONFIGURATION X-Git-Tag: v256-rc1~720^2~7 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=62b5bd3c8a17bad11cde728b0b592f9936e75648;p=thirdparty%2Fsystemd.git core: mark JoinControllers= as DISABLED_LEGACY rather than _CONFIGURATION Follow-up for 143fadf369a18449464956206226761e49be1928 --- diff --git a/src/core/main.c b/src/core/main.c index 1e66770df04..f09f19458e9 100644 --- a/src/core/main.c +++ b/src/core/main.c @@ -666,7 +666,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 },