test: Various mkosi integration test improvements

[thirdparty/systemd.git] / mkosi.conf

diff --git a/mkosi.conf b/mkosi.conf
index 02f6a90b6f3010af903f18d3f1d6b168f8acc7df..b2e8ba62bac9f0ec461ef4349e3e2c60d01ad12b 100644 (file)
--- a/mkosi.conf
+++ b/mkosi.conf
@@ -5,9 +5,9 @@
 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_.
@@ -20,8 +20,6 @@ BuildSourcesEphemeral=yes
 KernelCommandLine=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.