From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Mon, 5 Feb 2024 10:36:28 +0000 (+0100)
Subject: Use 8G by default for default image initrd boots in qemu
X-Git-Tag: v21~70^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d2721ab3a668d1f8425d7195e57b7dd802c166ff;p=thirdparty%2Fmkosi.git

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 c087dfd36..57b41ffde 100644
--- 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
index 000000000..080022ed1
--- /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 16a5a7141..b2e453b35 100644
--- 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)