morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 08:25:20 +09:00
Code Issues Packages Projects Releases Wiki Activity

vmspawn: fix grow_image: Assertion `path' failed.

Browse Source 
arg_image might be NULL (e.g. when booting a USI, or when passing -D)
This commit is contained in:
Arian van Putten
2025-05-01 11:58:21 +00:00
parent f17247c701
commit 10819eb0d5
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/vmspawn/vmspawn.c
View File

@@ -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)