From dbe3602abe23b306b3f08aa71957e2737b894108 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= Date: Mon, 27 Apr 2026 09:22:43 +0200 Subject: [PATCH] nspawn,vmspawn: fix state optarg uses --- src/nspawn/nspawn.c | 12 ++++++------ src/vmspawn/vmspawn.c | 8 ++++---- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/nspawn/nspawn.c b/src/nspawn/nspawn.c index 0a99c14e45..e4e0359ce6 100644 --- a/src/nspawn/nspawn.c +++ b/src/nspawn/nspawn.c @@ -1137,9 +1137,9 @@ static int parse_argv(int argc, char *argv[]) { } OPTION_LONG("restrict-address-families", "LIST", "Restrict socket address families to the given allowlist"): - r = parse_address_families(optarg, &arg_restrict_address_families, &arg_restrict_address_families_is_allowlist); + r = parse_address_families(opts.arg, &arg_restrict_address_families, &arg_restrict_address_families_is_allowlist); if (r < 0) - return log_error_errno(r, "Failed to parse --restrict-address-families= argument: %s", optarg); + return log_error_errno(r, "Failed to parse --restrict-address-families= argument: %s", opts.arg); arg_settings_mask |= SETTING_RESTRICT_ADDRESS_FAMILIES; break; @@ -1266,25 +1266,25 @@ static int parse_argv(int argc, char *argv[]) { OPTION_LONG("forward-journal-max-use", "BYTES", "Maximum disk space for forwarded journal"): r = parse_size(opts.arg, 1024, &arg_forward_journal_max_use); if (r < 0) - return log_error_errno(r, "Failed to parse --forward-journal-max-use= value: %s", optarg); + return log_error_errno(r, "Failed to parse --forward-journal-max-use= value: %s", opts.arg); break; OPTION_LONG("forward-journal-keep-free", "BYTES", "Minimum disk space to keep free"): r = parse_size(opts.arg, 1024, &arg_forward_journal_keep_free); if (r < 0) - return log_error_errno(r, "Failed to parse --forward-journal-keep-free= value: %s", optarg); + return log_error_errno(r, "Failed to parse --forward-journal-keep-free= value: %s", opts.arg); break; OPTION_LONG("forward-journal-max-file-size", "BYTES", "Maximum size of individual journal files"): r = parse_size(opts.arg, 1024, &arg_forward_journal_max_file_size); if (r < 0) - return log_error_errno(r, "Failed to parse --forward-journal-max-file-size= value: %s", optarg); + return log_error_errno(r, "Failed to parse --forward-journal-max-file-size= value: %s", opts.arg); break; OPTION_LONG("forward-journal-max-files", "N", "Maximum number of journal files to keep"): r = safe_atou64(opts.arg, &arg_forward_journal_max_files); if (r < 0) - return log_error_errno(r, "Failed to parse --forward-journal-max-files= value: %s", optarg); + return log_error_errno(r, "Failed to parse --forward-journal-max-files= value: %s", opts.arg); break; OPTION_GROUP("Mounts"): {} diff --git a/src/vmspawn/vmspawn.c b/src/vmspawn/vmspawn.c index 20e8f878f6..1714967776 100644 --- a/src/vmspawn/vmspawn.c +++ b/src/vmspawn/vmspawn.c @@ -807,25 +807,25 @@ static int parse_argv(int argc, char *argv[]) { OPTION_LONG("forward-journal-max-use", "BYTES", "Maximum disk space for forwarded journal"): r = parse_size(opts.arg, 1024, &arg_forward_journal_max_use); if (r < 0) - return log_error_errno(r, "Failed to parse --forward-journal-max-use= value: %s", optarg); + return log_error_errno(r, "Failed to parse --forward-journal-max-use= value: %s", opts.arg); break; OPTION_LONG("forward-journal-keep-free", "BYTES", "Minimum disk space to keep free"): r = parse_size(opts.arg, 1024, &arg_forward_journal_keep_free); if (r < 0) - return log_error_errno(r, "Failed to parse --forward-journal-keep-free= value: %s", optarg); + return log_error_errno(r, "Failed to parse --forward-journal-keep-free= value: %s", opts.arg); break; OPTION_LONG("forward-journal-max-file-size", "BYTES", "Maximum size of individual journal files"): r = parse_size(opts.arg, 1024, &arg_forward_journal_max_file_size); if (r < 0) - return log_error_errno(r, "Failed to parse --forward-journal-max-file-size= value: %s", optarg); + return log_error_errno(r, "Failed to parse --forward-journal-max-file-size= value: %s", opts.arg); break; OPTION_LONG("forward-journal-max-files", "N", "Maximum number of journal files to keep"): r = safe_atou64(opts.arg, &arg_forward_journal_max_files); if (r < 0) - return log_error_errno(r, "Failed to parse --forward-journal-max-files= value: %s", optarg); + return log_error_errno(r, "Failed to parse --forward-journal-max-files= value: %s", opts.arg); break; OPTION_LONG("pass-ssh-key", "BOOL", "Create an SSH key to access the VM"):