More problems with mountpoints.

[omvzfs.git] / src / Utils.php

diff --git a/src/Utils.php b/src/Utils.php
index 13c89ed5ddbbc096139acd84220b5354b796bf63..cc0814bdbc474f2383a9d7569c5ef2b88939cfb0 100644 (file)
--- a/src/Utils.php
+++ b/src/Utils.php
@@ -8,20 +8,66 @@ require_once("Dataset.php");
  */
 class OMVModuleZFSUtil {
 
+       /**
+        * 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
         */
-       public static function getUUIDbyName($name) {
-               preg_match('/^([A-Za-z0-9]+)\/?.*$/', $name, $result);
-               $name = $result[1];
-               unset($result);
-               $cmd = "blkid -o full";
+       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]);
+                       for ($i=0; $i<count($headers); $i++) {
+                               if (strcmp($headers[$i], "VALUE") === 0) {
+                                       $valuecol=$i;
+                                       break;
+                               }
+                       }
+                       $line = preg_split('/[\s]+/', $out[1]);
+                       return $line[$valuecol];
+               }
+               return null;
+       }
+
+       /**
+        * Add any missing ZFS pool to the OMV backend
+        *
+        */
+       public static function addMissingOMVMntEnt() {
+               global $xmlConfig;
+               $cmd = "zpool list -H -o name";
                OMVModuleZFSUtil::exec($cmd, $out, $res);
-               foreach($out as $line) {
-                       if(preg_match('/^.*LABEL=\"' . $name . '\" UUID=\"([A-Za-z0-9]+)\".*TYPE=\"zfs_member\"$/', $line, $result)) {
-                               return($result[1]);
+               foreach($out as $name) {
+                       $pooluuid = OMVModuleZFSUtil::getUUIDbyName($name);
+                       $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;
@@ -94,7 +140,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);