X-Git-Url: http://git.datanom.net/omvzfs.git/blobdiff_plain/f1fe98e64bb8c13b5321598e60b875bf0271913f..a50e3caf1d538eb4bb0cd5eb8f634cb18e0065ab:/src/Zvol.php diff --git a/src/Zvol.php b/src/Zvol.php index f2d3cd2..603188a 100644 --- a/src/Zvol.php +++ b/src/Zvol.php @@ -68,14 +68,12 @@ class OMVModuleZFSZvol { continue; } } - $qname = preg_quote($name . "@", '/'); - $cmd = "zfs list -H -t snapshot 2>&1"; - $this->exec($cmd, $out, $res); - foreach ($out as $line) { - if (preg_match('/^(' . $qname . '[^\s]+)\t.*$/', $line, $res)) { - $this->snapshots[$res[1]] = new OMVModuleZFSSnapshot($res[1]); - } + $cmd = "zfs list -r -o name -H -t snapshot " . $name . " 2>&1"; + $this->exec($cmd, $out2, $res2); + foreach ($out2 as $line2) { + $this->snapshots[$line2] = new OMVModuleZFSSnapshot($line2); } + } /**