Minor fixes to Dataset and Zvol constructors.

[omvzfs.git] / src / Dataset.php

diff --git a/src/Dataset.php b/src/Dataset.php
index 9abdb82cde2f50379a9fc83c1b8abfde710cf83f..f61baa1c24235755a82c11e73359c8aa58aefa0a 100644 (file)
--- a/src/Dataset.php
+++ b/src/Dataset.php
@@ -68,11 +68,13 @@ 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) {
-                               $this->snapshots[$line2] = new OMVModuleZFSSnapshot($line2);
+                                       $this->snapshots[$line2] = new OMVModuleZFSSnapshot($line2);
                        }
+               } else {
+                       $this->create();
                }
        }
 
@@ -103,7 +105,11 @@ class OMVModuleZFSDataset {
         * @access public
         */
        public function getSnapshots() {
-               return $this->snapshots;
+               if (isset($this->snapshots)) {
+                       return $this->snapshots;
+               } else {
+                       return array();
+               }
        }
 
        /**
@@ -175,17 +181,15 @@ class OMVModuleZFSDataset {
        }
 
        /**
-        * Craete a Dataset on commandline. Optionally provide a number of properties to set.
+        * Craete a Dataset on commandline.
         *
-        * @param array $properties Properties to set when creating the dataset.
         * @return void
-        * @access public
+        * @access private
         */
-       public function create(array $properties = null) {
+       private function create() {
                $cmd = "zfs create -p " . $this->name . " 2>&1";
                $this->exec($cmd,$out,$res);
                $this->updateAllProperties();
-               $this->setProperties($properties);
                $this->mountPoint = $this->properties["mountpoint"]["value"];
        }