X-Git-Url: http://git.datanom.net/omvzfs.git/blobdiff_plain/3baec6c054ef4463018a9bac53e21cf9fc5effe3..4163f889aa50c1ee7f66ff9392ba600048221edb:/gui/rpc/zfs.inc

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.