From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 7DA40601AA for ; Tue, 1 Dec 2020 09:24:27 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7BEA5E419 for ; Tue, 1 Dec 2020 09:24:27 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id D8140E410 for ; Tue, 1 Dec 2020 09:24:26 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 97D224409E for ; Tue, 1 Dec 2020 09:24:26 +0100 (CET) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Tue, 1 Dec 2020 09:24:19 +0100 Message-Id: <20201201082421.4646-2-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20201201082421.4646-1-f.ebner@proxmox.com> References: <20201201082421.4646-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.009 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust 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. [vzdump.pm] Subject: [pve-devel] [PATCH manager 2/4] vzdump: storage_info: adapt to new maxfiles backend behavior 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: , X-List-Received-Date: Tue, 01 Dec 2020 08:24:27 -0000 It's automatically converted to prune-backups when using storage_config() now. Signed-off-by: Fabian Ebner --- PVE/VZDump.pm | 4 ---- 1 file changed, 4 deletions(-) diff --git a/PVE/VZDump.pm b/PVE/VZDump.pm index c37fa513..94aa76ab 100644 --- a/PVE/VZDump.pm +++ b/PVE/VZDump.pm @@ -86,15 +86,11 @@ sub storage_info { my $info = { scfg => $scfg, - maxfiles => $scfg->{maxfiles}, }; $info->{'prune-backups'} = PVE::JSONSchema::parse_property_string('prune-backups', $scfg->{'prune-backups'}) if defined($scfg->{'prune-backups'}); - die "cannot have 'maxfiles' and 'prune-backups' configured at the same time\n" - if defined($info->{'prune-backups'}) && defined($info->{maxfiles}); - if ($type eq 'pbs') { $info->{pbs} = 1; } else { -- 2.20.1