mkosi: Switch to linux-virtual on Ubuntu

This now finally has support for credentials and erofs so let's switch
to this much smaller kernel package that doesn't pull in linux-firmware.

diff --git a/mkosi.conf b/mkosi.conf
index a5953d7613639eccf7c34ea3414c97d2f9015836..cea204961bbd101ffe8258fe8d1472c35b923af7 100644 (file)
--- a/mkosi.conf
+++ b/mkosi.conf
@@ -19,8 +19,6 @@ BuildSourcesEphemeral=yes
 
 [Host]
 @Incremental=yes
-# 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

diff --git a/mkosi.images/system/mkosi.conf.d/10-ubuntu/mkosi.conf b/mkosi.images/system/mkosi.conf.d/10-ubuntu/mkosi.conf
index 85126a1a37e915caf79cfc9a1310e9446e0ded94..957d00e42977f56b70330b07360eb8d4e766afbf 100644 (file)
--- a/mkosi.images/system/mkosi.conf.d/10-ubuntu/mkosi.conf
+++ b/mkosi.images/system/mkosi.conf.d/10-ubuntu/mkosi.conf
@@ -5,7 +5,6 @@ Distribution=ubuntu
 
 [Content]
 Packages=
-        # We would like to use linux-virtual but it does not have support for SMBIOS credentials.
-        linux-image-generic
+        linux-image-virtual
         linux-tools-common
-        linux-tools-generic
+        linux-tools-virtual