X-Git-Url: http://git.datanom.net/omvzfs.git/blobdiff_plain/c4ed2435c5b0a0d048369b6c52fbddfcd3c08cbb..e20fe312a03771aeb3233e1ef640a3c9b8d9c737:/src/Utils.php

diff --git a/src/Utils.php b/src/Utils.php
index 86d9205..4d577f8 100644
--- a/src/Utils.php
+++ b/src/Utils.php
@@ -8,6 +8,87 @@ require_once("Dataset.php");
  */
 class OMVModuleZFSUtil {
 
+	/**
+	 * Get /dev/disk/by-path from /dev/sdX
+	 *
+	 * @return string Disk identifier
+	 */
+	public static function getDiskPath($disk) {
+		preg_match("/^.*\/([A-Za-z0-9]+)$/", $disk, $identifier);
+		$cmd = "ls -la /dev/disk/by-path | grep '$identifier[1]$'";
+		OMVModuleZFSUtil::exec($cmd, $out, $res);
+		if (is_array($out)) {
+			$cols = preg_split('/[\s]+/', $out[0]);
+			return($cols[count($cols)-3]);
+		}
+	}
+
+
+	/**
+	 * Get poolname from name of dataset/volume etc.
+	 *
+	 * @return string Name of the pool
+	 */
+	public static function getPoolname($name) {
+		$tmp = preg_split('/[\/]+/', $name);
+		return($tmp[0]);
+	}
+
+	/**
+	 * Get UUID of ZFS pool by name
+	 *
+	 * @return string UUID of the pool
+	 */
+	public static function getUUIDbyName($poolname) {
+		$cmd = "zpool get guid " . $poolname . " 2>&1";
+		OMVModuleZFSUtil::exec($cmd, $out, $res);
+		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;
+	}
+
+	/**
+	 * Add any missing ZFS pool to the OMV backend
+	 *
+	 */
+	public static function addMissingOMVMntEnt() {
+		global $xmlConfig;
+		$cmd = "zpool list -H -o name";
+		OMVModuleZFSUtil::exec($cmd, $out, $res);
+		foreach($out as $name) {
+			$pooluuid = OMVModuleZFSUtil::getUUIDbyName($name);
+			$xpath = "//system/fstab/mntent[fsname=" . $pooluuid . "]";
+			$mountpoint = $xmlConfig->get($xpath);
+			if (is_null($mountpoint)) {
+				$uuid = OMVUtil::uuid();
+				$pool = new OMVModuleZFSZpool($name);
+				$dir = $pool->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;
+	}
+
 	/**
 	 * Get an array with all ZFS objects
 	 *
@@ -26,7 +107,7 @@ class OMVModuleZFSUtil {
 			$subdirs = preg_split('/\//',$path);
 			$root = $subdirs[0];
 			$tmp = array();
-			
+
 			switch ($type) {
 			case "filesystem":
 				if (strpos($path,'/') === false) {
@@ -75,7 +156,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);