X-Git-Url: http://git.datanom.net/omvzfs.git/blobdiff_plain/a36352f77c28bdf8f2834a64bd8520b73bfcf040..3baec6c054ef4463018a9bac53e21cf9fc5effe3:/src/Utils.php

diff --git a/src/Utils.php b/src/Utils.php
index 251157a..f00b6d1 100644
--- a/src/Utils.php
+++ b/src/Utils.php
@@ -17,12 +17,18 @@ class OMVModuleZFSUtil {
 		preg_match('/^([A-Za-z0-9]+)\/?.*$/', $name, $result);
 		$name = $result[1];
 		unset($result);
-		$cmd = "blkid -o full";
+		$cmd = "zpool get guid " . $name . " 2>&1";
 		OMVModuleZFSUtil::exec($cmd, $out, $res);
-		foreach($out as $line) {
-			if(preg_match('/^.*LABEL=\"' . $name . '\" UUID=\"([A-Za-z0-9]+)\".*TYPE=\"zfs_member\"$/', $line, $result)) {
-				return($result[1]);
+		if (isset($out)) {
+			$headers = preg_split('/[\s]+/', $out[0]);
+			for ($i=0; $i<count($headers); $i++) {
+				if (strcmp($headers[$i], "VALUE") === 0) {
+					$valuecol=$i;
+					break;
+				}
 			}
+			$line = preg_split('/[\s]+/', $out[1]);
+			return $line[$valuecol];
 		}
 		return null;
 	}
@@ -38,24 +44,34 @@ class OMVModuleZFSUtil {
 		OMVModuleZFSUtil::exec($cmd, $out, $res);
 		foreach($out as $name) {
 			$pooluuid = OMVModuleZFSUtil::getUUIDbyName($name);
-			$xpath = "//system/fstab/mntent[fsname=" . $pooluuid . "]";
-			$object = $xmlConfig->get($xpath);
-			if(is_null($object)) {
-				$uuid = OMVUtil::uuid();
-				$ds = new OMVModuleZFSDataset($name);
-				$dir = $ds->getMountPoint();
-				$object = array(
-					"uuid" => $uuid,
-					"fsname" => $pooluuid,
-					"dir" => $dir,
-					"type" => "zfs",
-					"opts" => "rw,relatime,xattr",
-					"freq" => "0",
-					"passno" => "2"
-				);
-				$xmlConfig->set("//system/fstab",array("mntent" => $object));
-				$dispatcher = &OMVNotifyDispatcher::getInstance();
-				$dispatcher->notify(OMV_NOTIFY_CREATE,"org.openmediavault.system.fstab.mntent", $object);
+			if (isset($pooluuid)) {
+				$pooluuid = "UUID=" . $pooluuid;
+				$xpath = "//system/fstab/mntent";
+				$object = $xmlConfig->get($xpath);
+				$uuidexists = false;
+				foreach ($object as $obj) {
+					if (strcmp($pooluuid, $obj['fsname']) === 0) {
+						$uuidexists = true;
+						break;
+					}
+				}
+				if (!$uuidexists) {
+					$uuid = OMVUtil::uuid();
+					$ds = new OMVModuleZFSDataset($name);
+					$dir = $ds->getMountPoint();
+					$object = array(
+						"uuid" => $uuid,
+						"fsname" => $pooluuid,
+						"dir" => $dir,
+						"type" => "zfs",
+						"opts" => "rw,relatime,xattr",
+						"freq" => "0",
+						"passno" => "2"
+					);
+					$xmlConfig->set("//system/fstab",array("mntent" => $object));
+					$dispatcher = &OMVNotifyDispatcher::getInstance();
+					$dispatcher->notify(OMV_NOTIFY_CREATE,"org.openmediavault.system.fstab.mntent", $object);
+				}
 			}
 		}
 		return null;
@@ -128,7 +144,7 @@ class OMVModuleZFSUtil {
 					'parentid'=>$prefix . $root . "/" . $result[1],
 					'name'=>$result[2],
 					'type'=>ucfirst($type),
-					'icon'=>"images/zfs_disk.png",
+					'icon'=>"images/save.png",
 					'path'=>$path,
 					'expanded'=>$expanded);
 				array_push($objects,$tmp);