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 5CA6A616C6 for ; Thu, 9 Jul 2020 14:00:27 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4B5E412085 for ; Thu, 9 Jul 2020 13:59:57 +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 8134C12078 for ; Thu, 9 Jul 2020 13:59:56 +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 45C6C40B4E for ; Thu, 9 Jul 2020 13:59:56 +0200 (CEST) Date: Thu, 9 Jul 2020 13:59:46 +0200 (CEST) From: Dietmar Maurer To: Proxmox Backup Server development discussion , Dominik Csapak Message-ID: <629570135.366.1594295987232@webmail.proxmox.com> In-Reply-To: <20200708125919.3622-6-d.csapak@proxmox.com> References: <20200708125919.3622-1-d.csapak@proxmox.com> <20200708125919.3622-6-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Priority: 3 Importance: Normal X-Mailer: Open-Xchange Mailer v7.10.3-Rev15 X-Originating-Client: open-xchange-appsuite X-SPAM-LEVEL: Spam detection results: 0 AWL 0.050 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 Subject: [pbs-devel] applied: [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: Thu, 09 Jul 2020 12:00:27 -0000 applied for now ... > On 07/08/2020 2:59 PM Dominik Csapak wrote: > > > 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 > > > > _______________________________________________ > pbs-devel mailing list > pbs-devel@lists.proxmox.com > https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel