X-Git-Url: http://git.datanom.net/omvzfs.git/blobdiff_plain/ff78c9eb1a79585ec8a78c4bc4c9c3e8eecf9f78..2777aa0105ab8da8c267156a076349651205c1cd:/src/Snapshot.php

diff --git a/src/Snapshot.php b/src/Snapshot.php
index c25dc9c..ef90283 100644
--- a/src/Snapshot.php
+++ b/src/Snapshot.php
@@ -41,7 +41,7 @@ class OMVModuleZFSSnapshot {
 	public function __construct($name) {
 		$this->name = $name;
 		$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 . '\t.*$/', $line)) {
@@ -93,7 +93,7 @@ class OMVModuleZFSSnapshot {
 	 */
 	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);
 		}
@@ -107,7 +107,7 @@ class OMVModuleZFSSnapshot {
 	 * @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]);
@@ -120,12 +120,16 @@ class OMVModuleZFSSnapshot {
 	 * @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) {
-			$tmpary = preg_split('/\t+/', $line);
-			$this->properties["$tmpary[1]"] = array("value" => $tmpary[2], "source" => $tmpary[3]);
+			$tmpary = preg_split('/\t/', $line);
+			if (strlen($tmpary[2] == 0)) {
+				$this->properties["$tmpary[1]"] = array("value" => "-", "source" => $tmpary[3]);
+			} else {
+				$this->properties["$tmpary[1]"] = array("value" => $tmpary[2], "source" => $tmpary[3]);
+			}
 		}
 	}
 
@@ -143,6 +147,17 @@ class OMVModuleZFSSnapshot {
 		$this->setProperties($properties);
 	}
 
+	/**
+	 * Destroy a Snapshot on commandline.
+	 *
+	 * @return void
+	 * @access public
+	 */
+	public function destroy() {
+		$cmd = "zfs destroy " . $this->name . " 2>&1";
+		$this->exec($cmd,$out,$res);
+	}
+
 	/**
 	 * Helper function to execute a command and throw an exception on error
 	 * (requires stderr redirected to stdout for proper exception message).