Diskmanage: replace check for zpool binary with a function and mock it

[pve-storage.git] / PVE / Diskmanage.pm

diff --git a/PVE/Diskmanage.pm b/PVE/Diskmanage.pm
index e356fb3a317a7f17d186bd90ad17cdadc3aa3030..64bb813fdfa59acbb3a1cc5513d8597492ca363d 100644 (file)
--- a/PVE/Diskmanage.pm
+++ b/PVE/Diskmanage.pm
@@ -19,6 +19,12 @@ my $PVS = "/sbin/pvs";
 my $LVS = "/sbin/lvs";
 my $LSBLK = "/bin/lsblk";
 
+sub check_bin {
+    my ($path) = @_;
+
+    return -x $path;
+}
+
 sub verify_blockdev_path {
     my ($rel_path) = @_;
 
@@ -201,7 +207,7 @@ sub get_zfs_devices {
     my ($lsblk_info) = @_;
     my $res = {};
 
-    return {} if ! -x $ZPOOL;
+    return {} if !check_bin($ZPOOL);
 
     # use zpool and parttype uuid,
     # because log and cache do not have