From: Stoiko Ivanov <s.ivanov@proxmox.com>
Date: Mon, 8 Apr 2019 12:38:36 +0000 (+0200)
Subject: Diskmanage: don't run zpool if not present
X-Git-Url: https://git.proxmox.com/?p=pve-storage.git;a=commitdiff_plain;h=4526dffa53cdce8a3718df2fce05890539c04d41;hp=e71336ad8883379c721592a88ac7905264df9ceb

Diskmanage: don't run zpool if not present

Since zfsutils are not a hard dependency of our stack it is possible to not have
`zpool` available.

Checking for existance of `zpool` before calling it suppresses spurious warnings
in the logs (e.g. when creating Ceph OSDs or accessing the 'Disk' Tab in the
GUI).

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>
---

diff --git a/PVE/Diskmanage.pm b/PVE/Diskmanage.pm
index 612bc3b..55df3f2 100644
--- a/PVE/Diskmanage.pm
+++ b/PVE/Diskmanage.pm
@@ -152,6 +152,8 @@ sub get_smart_data {
 sub get_zfs_devices {
     my $list = {};
 
+    return {} if !(-x $ZPOOL);
+
     # use zpool and parttype uuid,
     # because log and cache do not have
     # zfs type uuid