From: Arian van Putten <arian.vanputten@gmail.com>
Date: Thu, 1 May 2025 11:58:21 +0000 (+0000)
Subject: vmspawn: fix grow_image: Assertion `path' failed.
X-Git-Tag: v258-rc1~699^2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F37320%2Fhead;p=thirdparty%2Fsystemd.git

vmspawn: fix grow_image: Assertion `path' failed.

arg_image might be NULL (e.g. when booting a USI, or when passing -D)
---

diff --git a/src/vmspawn/vmspawn.c b/src/vmspawn/vmspawn.c
index 4ee9e473938..9e062006ab9 100644
--- a/src/vmspawn/vmspawn.c
+++ b/src/vmspawn/vmspawn.c
@@ -2041,6 +2041,10 @@ static int run_virtual_machine(int kvm_device_fd, int vhost_device_fd) {
                 r = strv_extend_many(&cmdline, "-device", "scsi-hd,drive=vmspawn,bootindex=1");
                 if (r < 0)
                         return log_oom();
+
+                r = grow_image(arg_image, arg_grow_image);
+                if (r < 0)
+                        return r;
         }
 
         if (arg_directory) {
@@ -2336,10 +2340,6 @@ static int run_virtual_machine(int kvm_device_fd, int vhost_device_fd) {
                         return log_error_errno(r, "Failed to parse $SYSTEMD_VMSPAWN_QEMU_EXTRA: %m");
         }
 
-        r = grow_image(arg_image, arg_grow_image);
-        if (r < 0)
-                return r;
-
         if (DEBUG_LOGGING) {
                 _cleanup_free_ char *joined = quote_command_line(cmdline, SHELL_ESCAPE_EMPTY);
                 if (!joined)