remove method which is final in extended method

[omvzfs.git] / src / Utils.php

diff --git a/src/Utils.php b/src/Utils.php
index 527d0f34890fea6258e446c289dd44e682629148..f00b6d1a01b509ce8eb4263f8603a61913feaf0f 100644 (file)
--- a/src/Utils.php
+++ b/src/Utils.php
@@ -45,9 +45,17 @@ class OMVModuleZFSUtil {
                foreach($out as $name) {
                        $pooluuid = OMVModuleZFSUtil::getUUIDbyName($name);
                        if (isset($pooluuid)) {
-                               $xpath = "//system/fstab/mntent[fsname=" . $pooluuid . "]";
+                               $pooluuid = "UUID=" . $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();
@@ -136,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);