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

diff --git a/src/Zvol.php b/src/Zvol.php
index f2d3cd2..aea0ca2 100644
--- a/src/Zvol.php
+++ b/src/Zvol.php
@@ -57,25 +57,25 @@ class OMVModuleZFSZvol {
 	 * @access public
 	 */
 	public function __construct($name) {
+		$zvol_exists = true;
 		$this->name = $name;
-		$qname = preg_quote($name, '/');
-		$cmd = "zfs list -H -t volume 2>&1";
-		$this->exec($cmd, $out, $res);
-		foreach ($out as $line) {
-			if (preg_match('/^' . $qname . '\t.*$/', $line)) {
-				$this->updateAllProperties();
-				$this->size = $this->properties["volsize"]["value"];
-				continue;
-			}
+		$cmd = "zfs list -H -t volume " . $name . " 2>&1";
+		try {
+			$this->exec($cmd, $out, $res);
+			$this->updateAllProperties();
+			$this->size = $this->properties["volsize"]["value"];
 		}
-		$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 . '[^\s]+)\t.*$/', $line, $res)) {
-				$this->snapshots[$res[1]] = new OMVModuleZFSSnapshot($res[1]);
+		catch (OMVModuleZFSException $e) {
+			$zvol_exists = false;
+		}
+		if ($zvol_exists) {
+			$cmd = "zfs list -r -o name -H -t snapshot " . $name . " 2>&1";
+			$this->exec($cmd, $out2, $res2);
+			foreach ($out2 as $line2) {
+				$this->snapshots[$line2] = new OMVModuleZFSSnapshot($line2);
 			}
 		}
+
 	}
 
 	/**