Use 8G by default for default image initrd boots in qemu

Default image size has grown enough to need 8G when booting as cpio,
UKI or ESP output.

diff --git a/mkosi.conf b/mkosi.conf
index c087dfd36e8e1b5838b17ccaa779690ebf403ccd..57b41ffde3cf626b34b8198dfc6c1084b6ff5337 100644 (file)
--- a/mkosi.conf
+++ b/mkosi.conf
@@ -41,3 +41,6 @@ RemoveFiles=
 
 # Make sure that SELinux doesn't run in enforcing mode even if it's pulled in as a dependency.
 KernelCommandLine=console=ttyS0 enforcing=0
+
+[Host]
+@QemuMem=4G

diff --git a/mkosi.conf.d/15-memory.conf b/mkosi.conf.d/15-memory.conf
new file mode 100644 (file)
index 0000000..080022e
--- /dev/null
+++ b/mkosi.conf.d/15-memory.conf
@@ -0,0 +1,9 @@
+# SPDX-License-Identifier: LGPL-2.1-or-later
+
+[Match]
+Format=|esp
+Format=|uki
+Format=|cpio
+
+[Host]
+@QemuMem=8G

diff --git a/tests/__init__.py b/tests/__init__.py
index 16a5a71417ad2ac478f0c25b34e7f9a4a5bdc76c..b2e453b354ff6ca844a4919a06bb89dd0521c6fb 100644 (file)
--- a/tests/__init__.py
+++ b/tests/__init__.py
@@ -79,7 +79,6 @@ class Image:
             "--cache-dir", "mkosi.cache",
             *(f"--kernel-command-line={i}" for i in kcl),
             "--qemu-vsock=yes",
-            "--qemu-mem=4G",
             verb,
             *args,
         ], check=check, stdin=stdin, stdout=sys.stdout, user=user, group=group)