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 27C525BF34 for ; Wed, 8 Jul 2020 14:59:22 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2254EA5D9 for ; Wed, 8 Jul 2020 14:59:22 +0200 (CEST) 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 73801A5B5 for ; Wed, 8 Jul 2020 14:59:20 +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 41F57441D6 for ; Wed, 8 Jul 2020 14:59:20 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Wed, 8 Jul 2020 14:59:19 +0200 Message-Id: <20200708125919.3622-6-d.csapak@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200708125919.3622-1-d.csapak@proxmox.com> References: <20200708125919.3622-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.000 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment KAM_LAZY_DOMAIN_SECURITY 1 Sending domain does not have any anti-forgery methods NO_DNS_FOR_FROM 0.379 Envelope sender has no MX or A DNS records 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_NONE 0.001 SPF: sender does not publish an 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. [disks.rs] Subject: [pbs-devel] [PATCH proxmox-backup 5/5] get_disks: don't fail on zfs_devices X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 08 Jul 2020 12:59:22 -0000 zfs does not have to be installed, so simply log an error and continue, users still get an error when clicking directly on ZFS Signed-off-by: Dominik Csapak --- src/tools/disks.rs | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/tools/disks.rs b/src/tools/disks.rs index a4c3e29..73f8370 100644 --- a/src/tools/disks.rs +++ b/src/tools/disks.rs @@ -743,7 +743,10 @@ pub fn get_disks( let partition_type_map = get_partition_type_info()?; - let zfs_devices = zfs_devices(&partition_type_map, None)?; + let zfs_devices = zfs_devices(&partition_type_map, None).or_else(|err| -> Result, Error> { + eprintln!("error getting zfs devices: {}", err); + Ok(HashSet::new()) + })?; let lvm_devices = get_lvm_devices(&partition_type_map)?; -- 2.20.1