build: add missing memfd-rexec option

Signed-off-by: Christian Brauner (Microsoft) <christian.brauner@ubuntu.com>

diff --git a/meson.build b/meson.build
index 65058e1eefb51307d81ebeff9bc6316c781ccbcd..d32cece63835374e156cb5c2bf03f52810f8ba18 100644 (file)
--- 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 4a2da223cc4ccde62997903296d7fe1d420595a8..a41de1b281ffe7956c2c2b36a2caef53f66f13ad 100644 (file)
--- 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')