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

vmspawn: change order of fields in --extra-drive=

Browse Source 
Closes #40877. As requested, --extra-drive=path[:format] is changed
to --extra-drive=[format:]path, so that the parsing is less ambiguous.
(In the original request, it was requested that the empty format can be
used also, but that was dropped in the second version of the patch.)
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2026-03-04 07:05:32 +09:00
committed by Yu Watanabe
parent 7791edc112
commit a8637c059b
3 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/vmspawn/vmspawn.c
+13 -10
View File
@@ -238,9 +238,9 @@ static int help(void) {
" Mount a file or directory from the host into the VM\n"
" --bind-ro=SOURCE[:TARGET]\n"
" Mount a file or directory, but read-only\n"
" --extra-drive=PATH[:FORMAT]\n"
" --extra-drive=[FORMAT:]PATH\n"
" Adds an additional disk to the virtual machine\n"
" (format: raw, qcow2; default: raw)\n"
" (FORMAT: raw, qcow2; default: raw)\n"
" --bind-user=NAME Bind user from host to virtual machine\n"
" --bind-user-shell=BOOL|PATH\n"
" Configure the shell to use for --bind-user= users\n"
@@ -559,23 +559,26 @@ static int parse_argv(int argc, char *argv[]) {
break;
case ARG_EXTRA_DRIVE: {
_cleanup_free_ char *buf = NULL, *drive_path = NULL;
ImageFormat format = IMAGE_FORMAT_RAW;
const char *dp = optarg;
const char *colon = strrchr(optarg, ':');
const char *colon = strchr(dp, ':');
if (colon) {
ImageFormat f = image_format_from_string(colon + 1);
_cleanup_free_ char *fs = strndup(optarg, colon - optarg);
if (!fs)
return log_oom();
ImageFormat f = image_format_from_string(fs);
if (f < 0)
log_debug_errno(f, "Failed to parse image format '%s', assuming it is a part of path, ignoring: %m", colon + 1);
log_debug_errno(f, "Cannot parse '%s' as an image format, assuming it is a part of path, ignoring.", fs);
else {
format = f;
buf = strndup(optarg, colon - optarg);
if (!buf)
return log_oom();
dp = colon + 1;
}
}
r = parse_path_argument(buf ?: optarg, /* suppress_root= */ false, &drive_path);
_cleanup_free_ char *drive_path = NULL;
r = parse_path_argument(dp, /* suppress_root= */ false, &drive_path);
if (r < 0)
return r;