Minor fixes to Dataset and Zvol constructors.

Signed-off-by: Niclas Berglind <nb@kjam.se>

diff --git a/src/Dataset.php b/src/Dataset.php
index 19dbc676a061e44fed819351f6cb33729d8ee0fe..f61baa1c24235755a82c11e73359c8aa58aefa0a 100644 (file)
--- a/src/Dataset.php
+++ b/src/Dataset.php
@@ -68,12 +68,10 @@ class OMVModuleZFSDataset {
                        $ds_exists = false;
                }
                if ($ds_exists) {
-                       $cmd = "zfs list -r -o name -H -t snapshot " . $name . " 2>&1";
+                       $cmd = "zfs list -r -d 1 -o name -H -t snapshot " . $name . " 2>&1";
                        $this->exec($cmd, $out2, $res2);
                        foreach ($out2 as $line2) {
-                               if (preg_match('/^' . preg_quote($name, '/') . '\@.*$/', $line2)) {
                                        $this->snapshots[$line2] = new OMVModuleZFSSnapshot($line2);
-                               }
                        }
                } else {
                        $this->create();

diff --git a/src/Zvol.php b/src/Zvol.php
index aea0ca2afca0f046fafa1be464f4fc61f5d2034e..fb86eeb4715b6e43b01031918c8a64fa3c000d7c 100644 (file)
--- a/src/Zvol.php
+++ b/src/Zvol.php
@@ -69,7 +69,7 @@ class OMVModuleZFSZvol {
                        $zvol_exists = false;
                }
                if ($zvol_exists) {
-                       $cmd = "zfs list -r -o name -H -t snapshot " . $name . " 2>&1";
+                       $cmd = "zfs list -r -d 1 -o name -H -t snapshot " . $name . " 2>&1";
                        $this->exec($cmd, $out2, $res2);
                        foreach ($out2 as $line2) {
                                $this->snapshots[$line2] = new OMVModuleZFSSnapshot($line2);