X-Git-Url: http://git.datanom.net/omvzfs.git/blobdiff_plain/cc1caa78f4dc963669b7a9cc5529b04cbe957d88..a238c1a16ee1162aa28919ea82d20b83a69c03c1:/src/Utils.php?ds=sidebyside

diff --git a/src/Utils.php b/src/Utils.php
index 0f67e36..c7049dc 100644
--- a/src/Utils.php
+++ b/src/Utils.php
@@ -185,7 +185,8 @@ class OMVModuleZFSUtil {
 						"type" => "zfs",
 						"opts" => "rw,relatime,xattr,noacl",
 						"freq" => "0",
-						"passno" => "0"
+						"passno" => "0",
+						"hidden" => "1"
 					);
 					$xmlConfig->set("//system/fstab",array("mntent" => $object));
 				}
@@ -225,6 +226,7 @@ class OMVModuleZFSUtil {
 						'expanded'=>$expanded,
 						'path'=>$path);
 					$pool = new OMVModuleZFSZpool($path);
+					$tmp['origin'] = "n/a";
 					$tmp['size'] = $pool->getSize();
 					$tmp['used'] = $pool->getAttribute("allocated");
 					$tmp['available'] = $pool->getAttribute("free");
@@ -242,12 +244,12 @@ class OMVModuleZFSUtil {
 					$ds =  new OMVModuleZFSDataset($path);
 					if ($ds->isClone()) {
 						//This is a cloned Filesystem
-						$tmp['type'] = "Clone";
 						$tmp['origin'] = $ds->getOrigin();
 					} else {
 						//This is a standard Filesystem.
-						$tmp['type']= ucfirst($type);
+						$tmp['origin'] = "n/a";
 					}
+					$tmp['type']= ucfirst($type);
 					$tmp['size'] = "n/a";
 					$used = $ds->getProperty("used");
 					$tmp['used'] = $used['value'];
@@ -267,7 +269,15 @@ class OMVModuleZFSUtil {
 					'icon'=>"images/save.png",
 					'path'=>$path,
 					'expanded'=>$expanded);
-				$vol = new OMVModuleZFSZvol();
+				$vol = new OMVModuleZFSZvol($path);
+				if ($vol->isClone()) {
+					//This is a cloned Volume
+					$tmp['origin'] = $vol->getOrigin();
+				} else {
+					//This is a standard Volume
+					$tmp['origin'] = "n/a";
+				}
+				$tmp['type']= ucfirst($type);
 				$tmp['size'] = $vol->getSize();
 				$tmp['used'] = "n/a";
 				$tmp['available'] = "n/a";
@@ -286,6 +296,7 @@ class OMVModuleZFSUtil {
 					'icon'=>'images/zfs_snap.png',
 					'path'=>$path,
 					'expanded'=>$expanded);
+				$tmp['origin'] = "n/a";
 				$tmp['size'] = "n/a";
 				$tmp['used'] = "n/a";
 				$tmp['available'] = "n/a";