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 EEC7370B8B for ; Fri, 25 Jun 2021 10:30:14 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E53DF1582C for ; Fri, 25 Jun 2021 10:29:44 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 6EAB31581E for ; Fri, 25 Jun 2021 10:29:44 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 423E5467A2 for ; Fri, 25 Jun 2021 10:29:44 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Fri, 25 Jun 2021 10:29:39 +0200 Message-Id: <20210625082940.25449-1-f.ebner@proxmox.com> X-Mailer: git-send-email 2.20.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.653 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [pve6to7.pm] Subject: [pve-devel] [PATCH manager 1/2] pve6to7: content check: fix detecting pass 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: Fri, 25 Jun 2021 08:30:15 -0000 If there is a log_fail, because of misconfigured 'none' content type, the final log_pass should not be printed. Signed-off-by: Fabian Ebner --- PVE/CLI/pve6to7.pm | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/PVE/CLI/pve6to7.pm b/PVE/CLI/pve6to7.pm index f56dd42c..3d5b780b 100644 --- a/PVE/CLI/pve6to7.pm +++ b/PVE/CLI/pve6to7.pm @@ -707,6 +707,7 @@ sub check_storage_content { log_info("Checking storage content type configuration.."); my $found; + my $pass = 1; my $storage_cfg = PVE::Storage::config(); @@ -718,6 +719,7 @@ sub check_storage_content { my $valid_content = PVE::Storage::Plugin::valid_content_types($scfg->{type}); if (scalar(keys $scfg->{content}->%*) == 0 && !$valid_content->{none}) { + $pass = 0; log_fail("storage '$storeid' does not support configured content type 'none'"); delete $scfg->{content}->{none}; # scan for guest images below } @@ -738,6 +740,7 @@ sub check_storage_content { if (scalar(@volumes) > 0) { $found = 1; + $pass = 0; log_warn("storage '$storeid' - neither content type 'images' nor 'rootdir' configured" .", but found guest volume(s):\n " . join("\n ", @volumes)); } @@ -746,7 +749,9 @@ sub check_storage_content { if ($found) { log_warn("PVE 7.0 enforces stricter content type checks. Guests referencing the above " . "volumes will not work until the storage configuration is fixed."); - } else { + } + + if ($pass) { log_pass("no problems found"); } } -- 2.20.1