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 05E071FF13E for ; Fri, 23 Jan 2026 15:34:46 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 74144FA57; Fri, 23 Jan 2026 15:35:02 +0100 (CET) From: Fiona Ebner To: pve-devel@lists.proxmox.com Date: Fri, 23 Jan 2026 15:34:24 +0100 Message-ID: <20260123143454.150800-5-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: 1769178839112 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.017 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 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [lxc.pm] Subject: [pve-devel] [PATCH container v3 4/8] run make tidy 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" Signed-off-by: Fiona Ebner --- New in v3. Done separately for readability of the previous commit, can be squashed into that. src/PVE/API2/LXC.pm | 29 ++++++++++------------------- 1 file changed, 10 insertions(+), 19 deletions(-) diff --git a/src/PVE/API2/LXC.pm b/src/PVE/API2/LXC.pm index ede8f62..8623d63 100644 --- a/src/PVE/API2/LXC.pm +++ b/src/PVE/API2/LXC.pm @@ -164,12 +164,10 @@ my sub create_ct_determine_mp_param { if (!defined($orig_mp_param)) { print "recovering backed-up configuration from '$archive'\n"; - (undef, $orig_mp_param) = - PVE::LXC::Create::recover_config($storage_cfg, $archive, $vmid); + (undef, $orig_mp_param) = PVE::LXC::Create::recover_config($storage_cfg, $archive, $vmid); } $mp_param = $orig_mp_param; - die - "rootfs configuration could not be recovered, please check and specify manually!\n" + die "rootfs configuration could not be recovered, please check and specify manually!\n" if !defined($mp_param->{rootfs}); PVE::LXC::Config->foreach_volume( $mp_param, @@ -177,40 +175,33 @@ my sub create_ct_determine_mp_param { my ($ms, $mountpoint) = @_; my $type = $mountpoint->{type}; if ($type eq 'volume') { - die - "unable to detect disk size - please specify $ms (size)\n" + die "unable to detect disk size - please specify $ms (size)\n" if !defined($mountpoint->{size}); my $disksize = $mountpoint->{size} / (1024 * 1024 * 1024); # create_disks expects GB as unit size delete $mountpoint->{size}; $mountpoint->{volume} = "$storage:$disksize"; $mp_param->{$ms} = PVE::LXC::Config->print_ct_mountpoint( - $mountpoint, - $ms eq 'rootfs', + $mountpoint, $ms eq 'rootfs', ); } else { my $type = $mountpoint->{type}; die "restoring rootfs to $type mount is only possible by specifying -rootfs manually!\n" if ($ms eq 'rootfs'); - die - "restoring '$ms' to $type mount is only possible for root\n" + die "restoring '$ms' to $type mount is only possible for root\n" if !$is_root; if ($mountpoint->{backup}) { warn "WARNING - unsupported configuration!\n"; - warn - "backup was enabled for $type mount point $ms ('$mountpoint->{mp}')\n"; + warn "backup was enabled for $type mount point $ms ('$mountpoint->{mp}')\n"; warn "mount point configuration will be restored after archive extraction!\n"; - warn - "contained files will be restored to wrong directory!\n"; + warn "contained files will be restored to wrong directory!\n"; } delete $mp_param->{$ms}; # actually delay bind/dev mps - $delayed_mp_param->{$ms} = - PVE::LXC::Config->print_ct_mountpoint( - $mountpoint, - $ms eq 'rootfs', - ); + $delayed_mp_param->{$ms} = PVE::LXC::Config->print_ct_mountpoint( + $mountpoint, $ms eq 'rootfs', + ); } }, ); -- 2.47.3 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel