From 4cd05d0777dc2c7bd96b3d533e776fc24afb3b06 Mon Sep 17 00:00:00 2001 From: Jamie Cameron Date: Sun, 27 Sep 2015 09:42:00 -0700 Subject: [PATCH] ZFS mounts may be from a device that is just the pool name https://sourceforge.net/p/webadmin/bugs/4188/ --- mount/mount-lib.pl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/mount/mount-lib.pl b/mount/mount-lib.pl index c6cb94871..ac2a48674 100755 --- a/mount/mount-lib.pl +++ b/mount/mount-lib.pl @@ -320,7 +320,7 @@ foreach my $m (@mounted) { $m->[2] eq "xfs" || $m->[2] eq "jfs" || $m->[2] eq "btrfs" || $m->[1] =~ /^\/dev\// || &indexof($m->[1], @$always) >= 0) { - if ($m->[1] =~ /^([^\/]+)\/([^\/]+)/ && + if ($m->[1] =~ /^([^\/]+)(\/(\S+))?/ && $m->[2] eq "zfs" && $zpools{$1} && $donezone{$1,$2}++) { # Don't double-count maps from the same zone pool next;