From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 4A9BB1FF13E for ; Fri, 23 Jan 2026 15:35:31 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 68FFAFF06; Fri, 23 Jan 2026 15:35:33 +0100 (CET) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Fri, 23 Jan 2026 15:34:26 +0100 Message-ID: <20260123143454.150800-7-f.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260123143454.150800-1-f.ebner@proxmox.com> References: <20260123143454.150800-1-f.ebner@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1769178839224 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.015 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH container v3 6/8] api: create: get rid of $storage_only_mode variable X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" The name is rather vague. The variable is set if and only if there are no mp params specified via the API, so explicitly check for that instead. This also makes it visible that in the non-restore case, the result of create_ct_determine_mp_param() does not depend upon $api_mp_param. Signed-off-by: Fiona Ebner --- New in v3. src/PVE/API2/LXC.pm | 19 ++++--------------- 1 file changed, 4 insertions(+), 15 deletions(-) diff --git a/src/PVE/API2/LXC.pm b/src/PVE/API2/LXC.pm index f7d5de4..fc278a7 100644 --- a/src/PVE/API2/LXC.pm +++ b/src/PVE/API2/LXC.pm @@ -137,28 +137,20 @@ __PACKAGE__->register_method({ my sub create_ct_determine_mp_param { my ( - $storage_cfg, - $vmid, - $archive, - $api_mp_param, - $orig_mp_param, - $restore, - $storage, - $storage_only_mode, + $storage_cfg, $vmid, $archive, $api_mp_param, $orig_mp_param, $restore, $storage, $is_root, ) = @_; my $mp_param; my $delayed_mp_param = {}; - if (!$storage_only_mode) { + if (scalar(keys $api_mp_param->%*)) { $mp_param = $api_mp_param; return ($mp_param, $delayed_mp_param); } if (!$restore) { - $mp_param = $api_mp_param; - $mp_param->{rootfs} = "$storage:4"; # defaults to 4GB + $mp_param = { rootfs => "$storage:4" }; # defaults to 4GB return ($mp_param, $delayed_mp_param); } @@ -437,7 +429,6 @@ __PACKAGE__->register_method({ my $no_disk_param = {}; my $api_mp_param = {}; - my $storage_only_mode = 1; foreach my $opt (keys %$param) { my $value = $param->{$opt}; if ($opt eq 'rootfs' || $opt =~ m/^mp\d+$/) { @@ -447,7 +438,6 @@ __PACKAGE__->register_method({ } else { $api_mp_param->{$opt} = $value; } - $storage_only_mode = 0; } elsif ($opt =~ m/^unused\d+$/) { warn "ignoring '$opt', cannot create/restore with unused volume\n"; delete $param->{$opt}; @@ -457,7 +447,7 @@ __PACKAGE__->register_method({ } die "mount points configured, but 'rootfs' not set - aborting\n" - if !$storage_only_mode && !defined($api_mp_param->{rootfs}); + if scalar(keys $api_mp_param->%*) && !defined($api_mp_param->{rootfs}); # check storage access, activate storage PVE::LXC::Config->foreach_volume( @@ -549,7 +539,6 @@ __PACKAGE__->register_method({ $orig_mp_param, $restore, $storage, - $storage_only_mode, $is_root, ); -- 2.47.3 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel