ZFS mounts may be from a device that is just the pool name https://sourceforge.net/p/webadmin/bugs/4188/

This commit is contained in:
Jamie Cameron
2015-09-27 09:42:00 -07:00
parent 207570d6c6
commit 4cd05d0777

View File

@@ -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;