Fixed some commands in Zvol class.

[omvzfs.git] / src / Zvol.php

diff --git a/src/Zvol.php b/src/Zvol.php
index c6fd20d5037364e976317fd7a8ad41a0bd205482..47701dc48ce5d2364a6874aa51700c52a0712d31 100644 (file)
--- a/src/Zvol.php
+++ b/src/Zvol.php
@@ -50,7 +50,7 @@ class OMVModuleZFSZvol {
        public function __construct($name) {
                $this->name = $name;
                $qname = preg_quote($name, '/');
-               $cmd = "zfs list -H -t volume";
+               $cmd = "zfs list -H -t volume 2>&1";
                $this->exec($cmd, $out, $res);
                foreach ($out as $line) {
                        if (preg_match('/^' . $qname . '\t.*$/', $line)) {
@@ -113,7 +113,7 @@ class OMVModuleZFSZvol {
         */
        public function setProperties($properties) {
                foreach ($properties as $newpropertyk => $newpropertyv) {
-                       $cmd = "zfs set " . $newpropertyk . "=" . $newpropertyv . " " . $this->name;
+                       $cmd = "zfs set " . $newpropertyk . "=" . $newpropertyv . " " . $this->name . " 2>&1";
                        $this->exec($cmd,$out,$res);
                        $this->updateProperty($newpropertyk);
                }
@@ -126,7 +126,7 @@ class OMVModuleZFSZvol {
         * @access private
         */
        private function updateAllProperties() {
-               $cmd = "zfs get -H all " . $this->name;
+               $cmd = "zfs get -H all " . $this->name . " 2>&1";
                $this->exec($cmd,$out,$res);
                unset($this->properties);
                foreach ($out as $line) {
@@ -135,6 +135,20 @@ class OMVModuleZFSZvol {
                }
        }
 
+       /**
+        * Get single Datset property from commandline and update object property attribute
+        * 
+        * @param string $property Name of the property to update
+        * @return void
+        * @access private
+        */
+       private function updateProperty($property) {
+               $cmd = "zfs get -H " . $property . " " . $this->name . " 2>&1";
+               $this->exec($cmd,$out,$res);
+               $tmpary = preg_split('/\t+/', $out[0]);
+               $this->properties["$tmpary[1]"] = array("value" => $tmpary[2], "source" => $tmpary[3]);
+       }
+
        /**
         * Create a Zvol on commandline. Optionally provide a number of properties to set.
         * 
@@ -146,7 +160,7 @@ class OMVModuleZFSZvol {
         */
        public function create($size, array $properties = null, $sparse = null) {
                $cmd = "zfs create -p ";
-               if (isset($sparse) && $sparse == true) {
+               if ((isset($sparse)) && ($sparse == true)) {
                        $cmd .= "-s ";
                }       
                $cmd .= "-V " . $size . " " . $this->name . " 2>&1";
@@ -163,8 +177,35 @@ class OMVModuleZFSZvol {
         * @access public
         */
        public function destroy() {
-               $cmd = "zfs destroy " . $this->name;
+               $cmd = "zfs destroy " . $this->name . " 2>&1";
+               $this->exec($cmd,$out,$res);
+       }
+
+       /**
+        * Renames a Zvol
+        * 
+        * @param string $newname New name of the Dataset
+        * @return void
+        * @access public
+        */
+       public function rename($newname) {
+               $cmd = "zfs rename -p " . $this->name . " " . $newname . " 2>&1";
+               $this->exec($cmd,$out,$res);
+               $this->name = $newname;
+       }
+
+       /**
+        * Clears a previously set proporty and specifies that it should be
+        * inherited from it's parent.
+        * 
+        * @param string $property Name of the property to inherit.
+        * @return void
+        * @access public
+        */
+       public function inherit($property) {
+               $cmd = "zfs inherit " . $property . " " . $this->name . " 2>&1";
                $this->exec($cmd,$out,$res);
+               $this->updateProperty($property);
        }
 
        /**