replace deprecated function join with implode

[omvzfs.git] / src / Zvol.php

diff --git a/src/Zvol.php b/src/Zvol.php
index aea0ca2afca0f046fafa1be464f4fc61f5d2034e..e35af5ab0e8c874b424519696b550e98d0b43c6c 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);
@@ -121,6 +121,20 @@ class OMVModuleZFSZvol {
                return $this->size;
        }
 
+       /**
+        * Get all Snapshots associated with the Zvol
+        * 
+        * @return array $snapshots
+        * @access public
+        */
+       public function getSnapshots() {
+               if (isset($this->snapshots)) {
+                       return $this->snapshots;
+               } else {
+                       return array();
+               }
+       }
+
        /**
         * Sets a number of Zvol properties. If a property is already set it will be updated with the new value.
         *