Fix to support /dev/disk/by-path when assembling an existing pool.

[omvzfs.git] / src / Utils.php

diff --git a/src/Utils.php b/src/Utils.php
index 4d577f8d26c3039e7caf91ebadd192722cc85f56..579d53c4f7399c2ec20a7b584486daa0ee37afc3 100644 (file)
--- a/src/Utils.php
+++ b/src/Utils.php
@@ -8,6 +8,40 @@ require_once("Dataset.php");
  */
 class OMVModuleZFSUtil {
 
+       /**
+        * Deletes all shared folders pointing to the specifc path
+        *
+        */
+       public static function deleteShares($name) {
+               global $xmlConfig;
+               $tmp = new OMVModuleZFSDataset($name);
+               $reldirpath = OMVModuleZFSUtil::getReldirpath($tmp->getMountPoint());
+               $poolname = OMVModuleZFSUtil::getPoolname($name);
+               $pooluuid = OMVModuleZFSUtil::getUUIDbyName($poolname);
+               $xpath = "//system/fstab/mntent[fsname='" . $pooluuid . "']";
+               $mountpoint = $xmlConfig->get($xpath);
+               $mntentuuid = $mountpoint['uuid'];
+               $xpath = "//system/shares/sharedfolder[mntentref='" . $mntentuuid . "' and reldirpath='" . $reldirpath . "']";
+               $xmlConfig->delete($xpath);
+               $dispatcher = &OMVNotifyDispatcher::getInstance();
+               $dispatcher->notify(OMV_NOTIFY_CREATE,"org.openmediavault.system.shares.sharedfolder");
+       }
+
+       /**
+        * Get the relative path by complete path
+        *
+        * @return string Relative path of the complet path
+        */
+       public static function getReldirpath($path) {
+               $subdirs = preg_split('/\//',$path);
+               $reldirpath = "";
+               for ($i=2;$i<count($subdirs);$i++) {
+                       $reldirpath .= $subdirs[$i] . "/";
+               }
+               return(rtrim($reldirpath, "/"));
+
+       }
+
        /**
         * Get /dev/disk/by-path from /dev/sdX
         *
@@ -66,7 +100,7 @@ class OMVModuleZFSUtil {
                OMVModuleZFSUtil::exec($cmd, $out, $res);
                foreach($out as $name) {
                        $pooluuid = OMVModuleZFSUtil::getUUIDbyName($name);
-                       $xpath = "//system/fstab/mntent[fsname=" . $pooluuid . "]";
+                       $xpath = "//system/fstab/mntent[fsname='" . $pooluuid . "']";
                        $mountpoint = $xmlConfig->get($xpath);
                        if (is_null($mountpoint)) {
                                $uuid = OMVUtil::uuid();
@@ -77,9 +111,9 @@ class OMVModuleZFSUtil {
                                        "fsname" => $pooluuid,
                                        "dir" => $dir,
                                        "type" => "zfs",
-                                       "opts" => "rw,relatime,xattr",
+                                       "opts" => "rw,relatime,xattr,noacl",
                                        "freq" => "0",
-                                       "passno" => "2"
+                                       "passno" => "0"
                                );
                                $xmlConfig->set("//system/fstab",array("mntent" => $object));
                                $dispatcher = &OMVNotifyDispatcher::getInstance();
@@ -111,7 +145,7 @@ class OMVModuleZFSUtil {
                        switch ($type) {
                        case "filesystem":
                                if (strpos($path,'/') === false) {
-                                       //This is a Pool, thus create both the Pool entry and a Filesystem entry corresponding to the Pool.
+                                       //This is a Pool
                                        $tmp = array('id'=>$prefix . $path,
                                                'parentid'=>'root',
                                                'name'=>$path,
@@ -120,19 +154,11 @@ class OMVModuleZFSUtil {
                                                'expanded'=>$expanded,
                                                'path'=>$path);
                                        array_push($objects,$tmp);
-                                       $tmp = array('id'=>$prefix . $path . '/' . $path,
-                                               'parentid'=>$prefix . $path,
-                                               'name'=>$path,
-                                               'type'=>'Filesystem',
-                                               'icon'=>'images/filesystem.png',
-                                               'path'=>$path,
-                                               'expanded'=>$expanded);
-                                       array_push($objects,$tmp);
                                } else {
-                                       //This is a Filesystem other than the Pool
+                                       //This is a Filesystem
                                        preg_match('/(.*)\/(.*)$/', $path, $result);
-                                       $tmp = array('id'=>$prefix . $root . "/" . $path,
-                                               'parentid'=>$prefix . $root . "/" . $result[1],
+                                       $tmp = array('id'=>$prefix . $path,
+                                               'parentid'=>$prefix . $result[1],
                                                'name'=>$result[2],
                                                'icon'=>"images/filesystem.png",
                                                'path'=>$path,
@@ -152,8 +178,8 @@ class OMVModuleZFSUtil {
 
                        case "volume":
                                preg_match('/(.*)\/(.*)$/', $path, $result);
-                               $tmp = array('id'=>$prefix . $root . "/" . $path,
-                                       'parentid'=>$prefix . $root . "/" . $result[1],
+                               $tmp = array('id'=>$prefix . $path,
+                                       'parentid'=>$prefix . $result[1],
                                        'name'=>$result[2],
                                        'type'=>ucfirst($type),
                                        'icon'=>"images/save.png",
@@ -166,8 +192,8 @@ class OMVModuleZFSUtil {
                                preg_match('/(.*)\@(.*)$/', $path, $result);
                                $subdirs = preg_split('/\//',$result[1]);
                                $root = $subdirs[0];
-                               $tmp = array('id'=>$prefix . $root . "/" . $path,
-                                       'parentid'=>$prefix . $root . "/" . $result[1],
+                               $tmp = array('id'=>$prefix . $path,
+                                       'parentid'=>$prefix . $result[1],
                                        'name'=>$result[2],
                                        'type'=>ucfirst($type),
                                        'icon'=>'images/zfs_snap.png',