test: Various mkosi integration test improvements

[thirdparty/systemd.git] / mkosi.conf

diff --git a/mkosi.conf b/mkosi.conf
index 96843db488149a85ac1d417cb6962b8c933aafea..b2e8ba62bac9f0ec461ef4349e3e2c60d01ad12b 100644 (file)
--- a/mkosi.conf
+++ b/mkosi.conf
@@ -1,13 +1,13 @@
 # SPDX-License-Identifier: LGPL-2.1-or-later
 
 [Config]
-Images=system
+@Images=system
 MinimumVersion=23~devel
 
 [Output]
-@OutputDirectory=mkosi.output
-@BuildDirectory=mkosi.builddir
-@CacheDirectory=mkosi.cache
+@OutputDirectory=build/mkosi.output
+@BuildDirectory=build/mkosi.builddir
+@CacheDirectory=build/mkosi.cache
 
 [Content]
 # Prevent ASAN warnings when building the image and ship the real ASAN options prefixed with MKOSI_.
@@ -17,27 +17,28 @@ Environment=ASAN_OPTIONS=verify_asan_link_order=false
 @SELinuxRelabel=no
 BuildSourcesEphemeral=yes
 
+KernelCommandLine=systemd.crash_shell
+                  systemd.log_level=debug,console:info
+                  systemd.log_ratelimit_kmsg=0
+                  # Disable the kernel's ratelimiting on userspace logging to kmsg.
+                  printk.devkmsg=on
+                  # Make sure /sysroot is mounted rw in the initrd.
+                  rw
+                  # Lower the default device timeout so we get a shell earlier if the root device does
+                  # not appear for some reason.
+                  systemd.default_device_timeout_sec=20
+                  # Make sure no LSMs are enabled by default.
+                  apparmor=0
+                  selinux=0
+                  enforcing=0
+                  systemd.early_core_pattern=/core
+                  systemd.firstboot=no
+                  systemd.setenv=SYSTEMD_ENABLE_LOG_CONTEXT=yes
+                  SYSTEMD_ENABLE_LOG_CONTEXT=yes
+
 [Host]
 @Incremental=yes
 @RuntimeSize=8G
+@RuntimeBuildSources=yes
+@QemuSmp=2
 ToolsTreePackages=virtiofsd
-KernelCommandLineExtra=systemd.crash_shell
-                       systemd.log_level=debug,console:info
-                       systemd.log_ratelimit_kmsg=0
-                       systemd.journald.forward_to_console
-                       systemd.journald.max_level_console=warning
-                       # Disable the kernel's ratelimiting on userspace logging to kmsg.
-                       printk.devkmsg=on
-                       # Make sure /sysroot is mounted rw in the initrd.
-                       rw
-                       # Lower the default device timeout so we get a shell earlier if the root device does
-                       # not appear for some reason.
-                       systemd.default_device_timeout_sec=10
-                       # Make sure no LSMs are enabled by default.
-                       apparmor=0
-                       selinux=0
-                       enforcing=0
-                       systemd.early_core_pattern=/core
-                       systemd.firstboot=no
-                       systemd.setenv=SYSTEMD_ENABLE_LOG_CONTEXT=yes
-                       SYSTEMD_ENABLE_LOG_CONTEXT=yes