Fix reldirpath value when creating a shared folder.

[omvzfs.git] / src / Utils.php

diff --git a/src/Utils.php b/src/Utils.php
index 978901e18d44d118827db44896976e46daf7e8a0..f997041da5cd83e75b154f6ebd88a08ee1ea83f4 100644 (file)
--- a/src/Utils.php
+++ b/src/Utils.php
@@ -8,16 +8,39 @@ require_once("Dataset.php");
  */
 class OMVModuleZFSUtil {
 
  */
 class OMVModuleZFSUtil {
 

+       /**
+        * Get /dev/disk/by-path from /dev/sdX
+        *
+        * @return string Disk identifier
+        */
+       public static function getDiskPath($disk) {
+               preg_match("/^.*\/([A-Za-z0-9]+)$/", $disk, $identifier);
+               $cmd = "ls -la /dev/disk/by-path | grep '$identifier[1]$'";
+               OMVModuleZFSUtil::exec($cmd, $out, $res);
+               if (is_array($out)) {
+                       $cols = preg_split('/[\s]+/', $out[0]);
+                       return($cols[count($cols)-3]);
+               }
+       }
+
+
+       /**
+        * 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
         */
        /**
         * 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]);
                OMVModuleZFSUtil::exec($cmd, $out, $res);
                if (isset($out)) {
                        $headers = preg_split('/[\s]+/', $out[0]);


@@ -39,32 +62,28 @@ class OMVModuleZFSUtil {
         */
        public static function addMissingOMVMntEnt() {
                global $xmlConfig;
         */
        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);
                $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[fsname=" . $pooluuid . "]";
-                               $object = $xmlConfig->get($xpath);
-                               if(is_null($object)) {
-                                       $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;
                        }
                }
                return null;


@@ -92,7 +111,7 @@ class OMVModuleZFSUtil {
                        switch ($type) {
                        case "filesystem":
                                if (strpos($path,'/') === false) {
                        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,
                                        $tmp = array('id'=>$prefix . $path,
                                                'parentid'=>'root',
                                                'name'=>$path,


@@ -101,19 +120,11 @@ class OMVModuleZFSUtil {
                                                'expanded'=>$expanded,
                                                'path'=>$path);
                                        array_push($objects,$tmp);
                                                '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 {
                                } else {

-                                       //This is a Filesystem other than the Pool
+                                       //This is a Filesystem

                                        preg_match('/(.*)\/(.*)$/', $path, $result);
                                        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,
                                                'name'=>$result[2],
                                                'icon'=>"images/filesystem.png",
                                                'path'=>$path,


@@ -133,11 +144,11 @@ class OMVModuleZFSUtil {
 
                        case "volume":
                                preg_match('/(.*)\/(.*)$/', $path, $result);
 
                        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),
                                        'name'=>$result[2],
                                        'type'=>ucfirst($type),

-                                       'icon'=>"images/zfs_disk.png",
+                                       'icon'=>"images/save.png",

                                        'path'=>$path,
                                        'expanded'=>$expanded);
                                array_push($objects,$tmp);
                                        'path'=>$path,
                                        'expanded'=>$expanded);
                                array_push($objects,$tmp);


@@ -147,8 +158,8 @@ class OMVModuleZFSUtil {
                                preg_match('/(.*)\@(.*)$/', $path, $result);
                                $subdirs = preg_split('/\//',$result[1]);
                                $root = $subdirs[0];
                                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',
                                        'name'=>$result[2],
                                        'type'=>ucfirst($type),
                                        'icon'=>'images/zfs_snap.png',