Minor change to snapshots in Dataset and Zvol classes.

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

diff --git a/src/Dataset.php b/src/Dataset.php
index 9ee6579c78c0322c3037e7fc234dbec136104fc2..28bd4d1fd864ec40a3322d6b239b12ac2b933604 100644 (file)
--- a/src/Dataset.php
+++ b/src/Dataset.php
@@ -67,13 +67,10 @@ class OMVModuleZFSDataset {
                                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);
                }
        }
 

diff --git a/src/Zvol.php b/src/Zvol.php
index f2d3cd27acb212386d003dad0df9dc196c66d188..603188aa6c49af16888294b847b8d137ba103948 100644 (file)
--- 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);
                }
+
        }
 
        /**