From: Christian Brauner Date: Mon, 13 Jun 2022 13:31:36 +0000 (+0200) Subject: build: add missing memfd-rexec option X-Git-Tag: lxc-5.0.0~2^2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=493bf2ded8633ccf2c69956c90f4e44acc0b54cb;p=thirdparty%2Flxc.git build: add missing memfd-rexec option Signed-off-by: Christian Brauner (Microsoft) --- diff --git a/meson.build b/meson.build index 65058e1ee..d32cece63 100644 --- a/meson.build +++ b/meson.build @@ -149,6 +149,7 @@ want_selinux = get_option('selinux') want_oss_fuzz = get_option('oss-fuzz') want_seccomp = get_option('seccomp') want_thread_safety = get_option('thread-safety') +want_memfd_rexec = get_option('memfd-rexec') srcconf.set_quoted('DEFAULT_CGROUP_PATTERN', cgrouppattern) if coverity @@ -405,6 +406,7 @@ if want_oss_fuzz endif srcconf.set10('ENFORCE_THREAD_SAFETY', want_thread_safety) +srcconf.set10('ENFORCE_MEMFD_REXEC', want_memfd_rexec) ## PAM. pam = cc.find_library('pam', has_headers: 'security/pam_modules.h', required: want_pam_cgroup) diff --git a/meson_options.txt b/meson_options.txt index 4a2da223c..a41de1b28 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -80,3 +80,6 @@ option('oss-fuzz', type : 'boolean', value : 'false', option('thread-safety', type : 'boolean', value : 'true', description : 'whether the build fails when thread-safe logging cannot be guaranteed') + +option('memfd-rexec', type : 'boolean', value : 'true', + description : 'whether to rexec the lxc-attach binary when attaching to a container')