From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Sun, 2 Jul 2023 19:40:59 +0000 (+0200)
Subject: Inline grow_image() and finalize_image()
X-Git-Tag: v15~92^2~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6175a165f025e2df5bd9153a72668a8053b00cbd;p=thirdparty%2Fmkosi.git

Inline grow_image() and finalize_image()

Both have only one caller, so let's just inline the functions
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index a87d24747..43ab95045 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -1912,10 +1912,6 @@ def check_root() -> None:
         die("Must be invoked as root.")
 
 
-def finalize_image(image: Path, *, size: str) -> None:
-    run(["systemd-repart", "--image", image, "--size", size, "--no-pager", "--dry-run=no", "--offline=no", image])
-
-
 @contextlib.contextmanager
 def acl_toggle_boot(config: MkosiConfig) -> Iterator[None]:
     if not config.acl or config.output_format != OutputFormat.directory:
@@ -1954,7 +1950,13 @@ def run_shell(args: MkosiArgs, config: MkosiConfig) -> None:
             fname = config.output_dir / config.output
 
         if config.output_format == OutputFormat.disk and args.verb == Verb.boot:
-            finalize_image(fname, size="8G")
+            run(["systemd-repart",
+                 "--image", fname,
+                 "--size", "8G",
+                 "--no-pager",
+                 "--dry-run=no",
+                 "--offline=no",
+                 fname])
 
         if config.output_format == OutputFormat.directory:
             cmdline += ["--directory", fname]
diff --git a/mkosi/qemu.py b/mkosi/qemu.py
index 189122418..abe940102 100644
--- a/mkosi/qemu.py
+++ b/mkosi/qemu.py
@@ -208,10 +208,6 @@ def copy_ephemeral(config: MkosiConfig, src: Path) -> Iterator[Path]:
         unlink_try_hard(tmp)
 
 
-def grow_image(image: Path, *, size: str) -> None:
-    run(["systemd-repart", "--definitions", "", "--no-pager", "--size", size, "--pretty", "no", image])
-
-
 def run_qemu(args: MkosiArgs, config: MkosiConfig) -> None:
     accel = "tcg"
     if config.qemu_kvm == ConfigFeature.enabled or (config.qemu_kvm == ConfigFeature.auto and qemu_check_kvm_support()):
@@ -279,7 +275,7 @@ def run_qemu(args: MkosiArgs, config: MkosiConfig) -> None:
             fname = config.output_dir / config.output
 
         if config.output_format == OutputFormat.disk:
-            grow_image(fname, size="8G")
+            run(["systemd-repart", "--definitions", "", "--no-pager", "--size", "8G", "--pretty", "no", fname])
 
         # Debian images fail to boot with virtio-scsi, see: https://github.com/systemd/mkosi/issues/725
         if config.output_format == OutputFormat.cpio: