mkosi: Build command line into the image

This allows using systemd-vmspawn itself while still getting a decent
experience.

diff --git a/mkosi.conf b/mkosi.conf
index b9c928b027b8d22c2c5995febf02ef0f2d32ebc7..02f6a90b6f3010af903f18d3f1d6b168f8acc7df 100644 (file)
--- a/mkosi.conf
+++ b/mkosi.conf
@@ -17,29 +17,30 @@ 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
+                  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=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=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