X-Git-Url: http://git.datanom.net/omvzfs.git/blobdiff_plain/ddcd45581e5728b126260ed27c6f52a43b2699e6..f1fe98e64bb8c13b5321598e60b875bf0271913f:/src/Dataset.php

diff --git a/src/Dataset.php b/src/Dataset.php
index c766f4e..9ee6579 100644
--- a/src/Dataset.php
+++ b/src/Dataset.php
@@ -58,7 +58,7 @@ class OMVModuleZFSDataset {
 	public function __construct($name) {
 		$this->name = $name;
 		$qname = preg_quote($name, '/');
-		$cmd = "zfs list -H";
+		$cmd = "zfs list -H 2>&1";
 		$this->exec($cmd, $out, $res);
 		foreach ($out as $line) {
 			if (preg_match('/^' . $qname . '\t.*$/', $line)) {
@@ -68,7 +68,7 @@ class OMVModuleZFSDataset {
 			}
 		}
 		$qname = preg_quote($name . "@", '/');
-		$cmd = "zfs list -H -t snapshot";
+		$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)) {
@@ -109,9 +109,10 @@ class OMVModuleZFSDataset {
 
 	/**
 	 * Get a single property value associated with the Dataset
-	 *
+	 * 
 	 * @param string $property Name of the property to fetch
-	 * @return array The returned array key 0=property value and key 1=property source.
+	 * @return array The returned array with the property. The property is an associative array with
+	 * two elements, <value> and <source>.
 	 * @access public
 	 */
 	public function getProperty($property) {
@@ -119,11 +120,10 @@ class OMVModuleZFSDataset {
 	}
 
 	/**
-	 * Get an associative array of all properties associated with the Dataset.
-	 *
-	 * @return array $properties Each entry is an array where key 0=property value and key
-	 * 1=property source.
-	 *
+	 * Get an associative array of all properties associated with the Snapshot
+	 * 
+	 * @return array $properties Each entry is an associative array with two elements
+	 * <value> and <source>
 	 * @access public
 	 */
 	public function getProperties() {
@@ -139,7 +139,7 @@ class OMVModuleZFSDataset {
 	 */
 	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);
 		}
@@ -152,7 +152,7 @@ class OMVModuleZFSDataset {
 	 * @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) {
@@ -169,7 +169,7 @@ class OMVModuleZFSDataset {
 	 * @access private
 	 */
 	private function updateProperty($property) {
-		$cmd = "zfs get -H " . $property . " " . $this->name;
+		$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]);
@@ -197,7 +197,7 @@ class OMVModuleZFSDataset {
 	 * @access public
 	 */
 	public function destroy() {
-		$cmd = "zfs destroy " . $this->name;
+		$cmd = "zfs destroy " . $this->name . " 2>&1";
 		$this->exec($cmd,$out,$res);
 	}