From 4163f889aa50c1ee7f66ff9392ba600048221edb Mon Sep 17 00:00:00 2001
From: Niclas Berglind <nb@kjam.se>
Date: Tue, 16 Sep 2014 21:47:27 +0200
Subject: [PATCH] More problems with mountpoints.

Signed-off-by: Niclas Berglind <nb@kjam.se>
---
 gui/rpc/zfs.inc | 10 ++++----
 src/Utils.php   | 64 +++++++++++++++++++++++--------------------------
 2 files changed, 34 insertions(+), 40 deletions(-)

diff --git a/gui/rpc/zfs.inc b/gui/rpc/zfs.inc
index 16b5a13..beaefa4 100644
--- a/gui/rpc/zfs.inc
+++ b/gui/rpc/zfs.inc
@@ -259,15 +259,13 @@ class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
 		$this->validateMethodContext($context, array("role" => OMV_ROLE_ADMINISTRATOR));
 
 		//Get the UUID of the Pool
-		$pooluuid = OMVModuleZFSUtil::getUUIDbyName($params['name']);
-		preg_match('/^([A-Za-z0-9]+)\/?.*$/', $params['name'], $result);
-		$poolname = $result[1];
-		unset($result);
+		$poolname = OMVModuleZFSUtil::getPoolname($params['name']);
+		$pooluuid = OMVModuleZFSUtil::getUUIDbyName($poolname);
 
 		//Get the mntent object and fetch it's uuid.
 		$xpath = "//system/fstab/mntent[fsname=" . $pooluuid . "]";
-		$object = $xmlConfig->get($xpath);
-		$mntentref = $object['uuid'];
+		$mountpoint = $xmlConfig->get($xpath);
+		$mntentref = $mountpoint['uuid'];
 
 		// Prepare the configuration object. Use the name of the shared
 		// folder as the relative directory name of the share.
diff --git a/src/Utils.php b/src/Utils.php
index f00b6d1..cc0814b 100644
--- a/src/Utils.php
+++ b/src/Utils.php
@@ -8,16 +8,23 @@ require_once("Dataset.php");
  */
 class OMVModuleZFSUtil {
 
+	/**
+	 * 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($name) {
-		preg_match('/^([A-Za-z0-9]+)\/?.*$/', $name, $result);
-		$name = $result[1];
-		unset($result);
-		$cmd = "zpool get guid " . $name . " 2>&1";
+	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]);
@@ -39,39 +46,28 @@ class OMVModuleZFSUtil {
 	 */
 	public static function addMissingOMVMntEnt() {
 		global $xmlConfig;
-		$msg = "";
 		$cmd = "zpool list -H -o name";
 		OMVModuleZFSUtil::exec($cmd, $out, $res);
 		foreach($out as $name) {
 			$pooluuid = OMVModuleZFSUtil::getUUIDbyName($name);
-			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);
-				}
+			$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;
-- 
2.39.2