Use /dev/disk/by-path as default for new pools as suggested by ZoL FAQ.

[omvzfs.git] / gui / rpc / zfs.inc

diff --git a/gui/rpc/zfs.inc b/gui/rpc/zfs.inc
index b110ebe24e6c5266f81bda4fb0585d3e5e3f8c77..84fa26d9c481f0b5c08107862bce15ec313ae5ab 100644 (file)
--- a/gui/rpc/zfs.inc
+++ b/gui/rpc/zfs.inc
@@ -11,6 +11,7 @@ require_once("zfs/Dataset.php");
 require_once("zfs/Snapshot.php");
 require_once("zfs/Zvol.php");
 require_once("zfs/Zpool.php");
 require_once("zfs/Snapshot.php");
 require_once("zfs/Zvol.php");
 require_once("zfs/Zpool.php");

+require_once("zfs/NotifyListener.php");

 
 class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
        public function getName() {
 
 class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
        public function getName() {


@@ -53,9 +54,27 @@ class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
                        throw new OMVModuleZFSException("Incorrect pool type specified");
                        break;
                }
                        throw new OMVModuleZFSException("Incorrect pool type specified");
                        break;
                }

+               //Check for user supplied options
+               $opts = "";
+               if ($params['force']) {
+                       $opts .= "-f ";
+               }
+               if (strlen($params['mountpoint']) > 0) {
+                       $opts .= "-m " . $params['mountpoint'] . " ";
+               }
+
+               //Use /dev/disk/by-path as deafult when creating new pools as suggested in ZoL FAQ.

                $disks = preg_split("/[,;]/", $params['devices']);
                $disks = preg_split("/[,;]/", $params['devices']);

+               if (file_exists("/dev/disk/by-path/")) {
+                       $tmp_disks = array();
+                       foreach ($disks as $disk) {
+                               $tmp_disks[] = OMVModuleZFSUtil::getDiskPath($disk);
+                       }
+                       $disks = $tmp_disks;
+               }
+

                $vdev = new OMVModuleZFSVdev($params['name'], $pooltype, $disks);
                $vdev = new OMVModuleZFSVdev($params['name'], $pooltype, $disks);

-               $pool = new OMVModuleZFSZpool($vdev);
+               $pool = new OMVModuleZFSZpool($vdev, $opts);

                //Ugly fix to solve the problem of blkid not displaying info on newly created pools
                $pool->export();
                $pool->import($pool->getName());
                //Ugly fix to solve the problem of blkid not displaying info on newly created pools
                $pool->export();
                $pool->import($pool->getName());


@@ -249,15 +268,13 @@ class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
                $this->validateMethodContext($context, array("role" => OMV_ROLE_ADMINISTRATOR));
 
                //Get the UUID of the Pool
                $this->validateMethodContext($context, array("role" => OMV_ROLE_ADMINISTRATOR));
 
                //Get the UUID of the Pool

-               $pooluuid = OMVModuleZFSUtil::getUUIDbyName($params['name']);
-               preg_match('/^([A-Za-z0-9]+)\/?.*$/', $params['name'], $result);
-               $poolname = $result[1];
-               unset($result);
+               $poolname = OMVModuleZFSUtil::getPoolname($params['name']);
+               $pooluuid = OMVModuleZFSUtil::getUUIDbyName($poolname);

 
                //Get the mntent object and fetch it's uuid.
                $xpath = "//system/fstab/mntent[fsname=" . $pooluuid . "]";
 
                //Get the mntent object and fetch it's uuid.
                $xpath = "//system/fstab/mntent[fsname=" . $pooluuid . "]";

-               $object = $xmlConfig->get($xpath);
-               $mntentref = $object['uuid'];
+               $mountpoint = $xmlConfig->get($xpath);
+               $mntentref = $mountpoint['uuid'];

 
                // Prepare the configuration object. Use the name of the shared
                // folder as the relative directory name of the share.
 
                // Prepare the configuration object. Use the name of the shared
                // folder as the relative directory name of the share.