Merge pull request #31899 from yuwata/sd-journal-add-match

[thirdparty/systemd.git] / mkosi.conf

diff --git a/mkosi.conf b/mkosi.conf
index b66b7726f1641d44ca1e190b911aa93424ef3e66..a5953d7613639eccf7c34ea3414c97d2f9015836 100644 (file)
--- a/mkosi.conf
+++ b/mkosi.conf
@@ -2,22 +2,27 @@
 
 [Config]
 Images=system
+MinimumVersion=21
 
 [Output]
-OutputDirectory=mkosi.output
-BuildDirectory=mkosi.builddir
-CacheDirectory=mkosi.cache
+@OutputDirectory=mkosi.output
+@BuildDirectory=mkosi.builddir
+@CacheDirectory=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
+@SELinuxRelabel=no
+BuildSourcesEphemeral=yes
 
 [Host]
 @Incremental=yes
-@QemuMem=2G
+# TODO: Drop to 2G again once the next Noble kernel update ships and we can use linux-image-virtual.
+@QemuMem=4G
 @RuntimeSize=8G
+ToolsTreePackages=virtiofsd
 KernelCommandLineExtra=systemd.crash_shell
                        systemd.log_level=debug
                        systemd.log_ratelimit_kmsg=0
@@ -36,3 +41,5 @@ KernelCommandLineExtra=systemd.crash_shell
                        enforcing=0
                        systemd.early_core_pattern=/core
                        systemd.firstboot=no
+                       systemd.setenv=SYSTEMD_ENABLE_LOG_CONTEXT=yes
+                       SYSTEMD_ENABLE_LOG_CONTEXT=yes