Minor fixes to Dataset and Zvol constructors.

[omvzfs.git] / src / Snapshot.php

diff --git a/src/Snapshot.php b/src/Snapshot.php
index ef90283de51c343696835a45cbab573e1c2c0ce4..b30def21c05864a622e5ddb6aa6031c1ee3e68c6 100644 (file)
--- a/src/Snapshot.php
+++ b/src/Snapshot.php
@@ -39,15 +39,18 @@ class OMVModuleZFSSnapshot {
         * @access public
         */
        public function __construct($name) {
         * @access public
         */
        public function __construct($name) {

+               $snap_exists = true;

                $this->name = $name;
                $this->name = $name;

-               $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 . '\t.*$/', $line)) {
-                               $this->updateAllProperties();
-                               continue;
-                       }
+               $cmd = "zfs list -H -t snapshot " .$name . " 2>&1";
+               try {
+                       $this->exec($cmd, $out, $res);
+                       $this->updateAllProperties();
+               }
+               catch (OMVModuleZFSException $e) {
+                       $snap_exists = false;
+               }
+               if (!$snap_exists) {
+                       $this->create();

                }
        }
 
                }
        }
 


@@ -134,17 +137,15 @@ class OMVModuleZFSSnapshot {
        }
 
        /**
        }
 
        /**

-        * Craete a Snapshot on commandline. Optionally provide a number of properties to set.
+        * Create a Snapshot on commandline.

         * 
         * 

-        * @param array $properties Properties to set when creating the dataset.

         * @return void
         * @return void

-        * @access public
+        * @access private

         */
         */

-       public function create(array $properties = null) {
+       private function create() {

                $cmd = "zfs snapshot " . $this->name . " 2>&1";
                $this->exec($cmd,$out,$res);
                $this->updateAllProperties();
                $cmd = "zfs snapshot " . $this->name . " 2>&1";
                $this->exec($cmd,$out,$res);
                $this->updateAllProperties();

-               $this->setProperties($properties);

        }
 
        /**
        }
 
        /**