summaryrefslogtreecommitdiff
path: root/mkosi.conf.d
diff options
context:
space:
mode:
authorDaan De Meyer <daan.j.demeyer@gmail.com>2023-02-21 15:09:38 +0100
committerDaan De Meyer <daan.j.demeyer@gmail.com>2023-02-21 15:20:18 +0100
commit01a0756427c847b26402ceffe508d726ffb42882 (patch)
treee40e866aed5141cb7c99cc448fa5d805477d8a57 /mkosi.conf.d
parentfff772bee8c10813b419be9808977fad1cc547f0 (diff)
downloadsystemd-01a0756427c847b26402ceffe508d726ffb42882.tar.gz
mkosi: Move more logic to the postinst script
Let's move stuff that only applies to the final image to the postinst script. Let's also move out some of the static files to mkosi.extra/ instead of hardcoding them in scripts.
Diffstat (limited to 'mkosi.conf.d')
-rw-r--r--mkosi.conf.d/10-systemd.conf4
1 files changed, 3 insertions, 1 deletions
diff --git a/mkosi.conf.d/10-systemd.conf b/mkosi.conf.d/10-systemd.conf
index 57db7ecda9..0eeee89052 100644
--- a/mkosi.conf.d/10-systemd.conf
+++ b/mkosi.conf.d/10-systemd.conf
@@ -4,8 +4,10 @@
[Output]
Bootable=yes
-# Prevent ASAN warnings when building the image
+# 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
OutputDirectory=mkosi.output
[Content]