summaryrefslogtreecommitdiffstats
path: root/mkosi.conf
diff options
context:
space:
mode:
authorDaan De Meyer <daan.j.demeyer@gmail.com>2024-05-16 17:18:38 +0200
committerDaan De Meyer <daan.j.demeyer@gmail.com>2024-05-30 12:47:45 +0200
commitaef13ad0294b403993e19b424b26535fb65749f4 (patch)
tree4c420a5b628c3106f5b47b004f3df97818dff002 /mkosi.conf
parenttest-network: Add dirs_exist_ok=True to cp_r() (diff)
downloadsystemd-aef13ad0294b403993e19b424b26535fb65749f4.tar.xz
systemd-aef13ad0294b403993e19b424b26535fb65749f4.zip
mkosi: Sanitizer improvements
- Let's set the environment on the kernel command line so it applies to initrd and main system. - Let's add the necessary wrappers that are also added in test-functions. Unlike test-functions we don't use gcc/clang to get the library path as that requires installing gcc/clang in the initrd. - Let's drop the hack to get journald writing to the console and have it write to kmsg instead. We'll get the output either way. - Stop removing libstdc++ and sanitizer libraries from Arch Linux initrds and other images as it's required by the sanitizer libraries. - Add a workaround for specifying extra meson options for opensuse - Add a leak sanitizer suppression file as a workaround for a false positive leak in verify_selinuxmnt() in libselinux. We do a soname match because the stacktrace can't be properly symbolized on Debian.
Diffstat (limited to 'mkosi.conf')
-rw-r--r--mkosi.conf10
1 files changed, 3 insertions, 7 deletions
diff --git a/mkosi.conf b/mkosi.conf
index 2da8804a7e..8ad0cb0d0f 100644
--- a/mkosi.conf
+++ b/mkosi.conf
@@ -10,13 +10,9 @@ MinimumVersion=23~devel
@CacheDirectory=build/mkosi.cache
[Content]
-# Prevent ASAN warnings when building the image and ship the real ASAN options prefixed with MKOSI_.
-Environment=ASAN_OPTIONS=verify_asan_link_order=false
- MKOSI_ASAN_OPTIONS=strict_string_checks=1:detect_stack_use_after_return=1:check_initialization_order=1:strict_init_order=1:disable_coredump=0:use_madv_dontdump=1
- MKOSI_UBSAN_OPTIONS=print_stacktrace=1:print_summary=1:halt_on_error=1
- # The kernel versions in CentOS Stream 9 and Ubuntu 22.04 don't support orphan_file, but later
- # versions of mkfs.ext4 enabled it by default, so we disable it explicitly.
- SYSTEMD_REPART_MKFS_OPTIONS_EXT4="-O ^orphan_file"
+# The kernel versions in CentOS Stream 9 and Ubuntu 22.04 don't support orphan_file, but later
+# versions of mkfs.ext4 enabled it by default, so we disable it explicitly.
+Environment=SYSTEMD_REPART_MKFS_OPTIONS_EXT4="-O ^orphan_file"
@SELinuxRelabel=no
BuildSourcesEphemeral=yes