SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vmspawn: reject .mstack machine images gracefully

Browse Source 
OCI pulls create .mstack machine images, which vmspawn can
discover via -M. Since vmspawn only supports directory and disk
images, this currently reaches assert_not_reached() and aborts.

Return EOPNOTSUPP with a readable error instead.

Fixes #41541
This commit is contained in:
zouge666
2026-09-07 15:06:30 +02:00
committed by Lennart Poettering
parent 2560925dd8
commit 7d463c443a
1 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vmspawn/vmspawn.c
+15 -4
View File
@@ -4079,12 +4079,23 @@ static int determine_names(void) {
if (r < 0)
return log_error_errno(r, "Failed to find image for machine '%s': %m", arg_machine);
if (IN_SET(i->type, IMAGE_RAW, IMAGE_BLOCK))
switch (i->type) {
case IMAGE_RAW:
case IMAGE_BLOCK:
r = free_and_strdup(&arg_image, i->path);
else if (IN_SET(i->type, IMAGE_DIRECTORY, IMAGE_SUBVOLUME))
break;
case IMAGE_DIRECTORY:
case IMAGE_SUBVOLUME:
r = free_and_strdup(&arg_directory, i->path);
else
assert_not_reached();
break;
default:
return log_error_errno(SYNTHETIC_ERRNO(EOPNOTSUPP),
"Image '%s' at '%s' has unsupported type '%s'. "
"Please use 'systemd-nspawn -M %s' instead.",
arg_machine, i->path, image_type_to_string(i->type), arg_machine);
}
if (r < 0)
return log_oom();
} else {