From: Antonius Frie Date: Mon, 8 Feb 2021 08:15:15 +0000 (+0100) Subject: Use correct config parser for MountAPIVFS (#18501) X-Git-Tag: v248-rc1~189 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4d0052d52f1359a054e83037c733bb3330ba4124;p=thirdparty%2Fsystemd.git Use correct config parser for MountAPIVFS (#18501) As far as I can see, at some point the parser function for MountAPIVFS was changed from the generic bool parser to a custom implementation, to allow the context to keep track of whether MountAPIVFS had been set explicitly. If not, exec_context_get_effective_mount_apivfs would fall back to a default value. However, the corresponding entry in the big parser table wasn't updated, meaning that the old bool parser was still used, meaning that context->mount_apivfs_set remained at its default value of false, meaning that the default value was always used and the config option was effectively ignored. Fix for 5e98086d1629f5c5b73645ba2568de4b09b7d958. --- diff --git a/src/core/load-fragment-gperf.gperf.m4 b/src/core/load-fragment-gperf.gperf.m4 index 81f4561a572..be07c7604cc 100644 --- a/src/core/load-fragment-gperf.gperf.m4 +++ b/src/core/load-fragment-gperf.gperf.m4 @@ -139,7 +139,7 @@ $1.PrivateMounts, config_parse_bool, $1.ProtectSystem, config_parse_protect_system, 0, offsetof($1, exec_context.protect_system) $1.ProtectHome, config_parse_protect_home, 0, offsetof($1, exec_context.protect_home) $1.MountFlags, config_parse_exec_mount_flags, 0, offsetof($1, exec_context.mount_flags) -$1.MountAPIVFS, config_parse_bool, 0, offsetof($1, exec_context.mount_apivfs) +$1.MountAPIVFS, config_parse_exec_mount_apivfs, 0, offsetof($1, exec_context) $1.Personality, config_parse_personality, 0, offsetof($1, exec_context.personality) $1.RuntimeDirectoryPreserve, config_parse_runtime_preserve_mode, 0, offsetof($1, exec_context.runtime_directory_preserve_mode) $1.RuntimeDirectoryMode, config_parse_mode, 0, offsetof($1, exec_context.directories[EXEC_DIRECTORY_RUNTIME].mode)