Last commit introduced new issues.

Signed-off-by: Niclas Berglind <nb@kjam.se>

diff --git a/src/Utils.php b/src/Utils.php
index 978901e18d44d118827db44896976e46daf7e8a0..8dba1fe134a6303c61cf26ddaaa2b0da7736fdbb 100644 (file)
--- a/src/Utils.php
+++ b/src/Utils.php
@@ -46,9 +46,16 @@ class OMVModuleZFSUtil {
                        $pooluuid = OMVModuleZFSUtil::getUUIDbyName($name);
                        if (isset($pooluuid)) {
                                $pooluuid = "UUID=" . $pooluuid;
-                               $xpath = "//system/fstab/mntent[fsname=" . $pooluuid . "]";
+                               $xpath = "//system/fstab/mntent";
                                $object = $xmlConfig->get($xpath);
-                               if(is_null($object)) {
+                               $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();