Support optional mountpoint value when creating filesystem.

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

diff --git a/gui/rpc/zfs.inc b/gui/rpc/zfs.inc
index bbab27ca3824b961d5dc8136ab5cc2406dd5e62a..2b12b18d5b1623706a8c2500d8ba21d536f15c5c 100644 (file)
--- a/gui/rpc/zfs.inc
+++ b/gui/rpc/zfs.inc
@@ -130,7 +130,8 @@ class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
                                  "path":{"type":"string"},
                                  "name":{"type":"string"},
                                  "size":{"type":"string"},
-                                 "clonename":{"type":"string"}
+                                 "clonename":{"type":"string"},
+                                 "mountpoint":{"type":"string"}
                          }
                  }');
                switch ($params['type']) {
@@ -141,6 +142,10 @@ class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
                case "filesystem":
                        $name = $params['path'] . "/" . $params['name'];
                        $tmp = new OMVModuleZFSDataset($name);
+                       if (strlen($params['mountpoint']) > 0) {
+                               $properties = array("mountpoint"=>$params['mountpoint']);
+                               $tmp->setProperties($properties);
+                       }
                        break;
                case "snapshot":
                        $name = $params['path'] . "@" . $params['name'];
@@ -511,8 +516,18 @@ class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
                        $cmd = "zfs get all {$params['name']}";
                        break;
                case "Pool":
-                       $output .= "Pool details (zpool get all):\n\r\n\r";
+                       $output .= "Pool status (zpool status):\n\r\n\r";
+                       $cmd = "zpool status {$params['name']}";
+                       OMVModuleZFSUtil::exec($cmd,$out,$res);
+                       $output .= implode("\n\r", $out);
+                       unset($out);
+                       $output .= "\n\r\n\rPool details (zpool get all):\n\r\n\r";
                        $cmd = "zpool get all {$params['name']}";
+                       OMVModuleZFSUtil::exec($cmd,$out,$res);
+                       $output .= implode("\n\r", $out);
+                       unset($out);
+                       $output .= "\n\r\n\rPool filesystem details (zfs get all):\n\r\n\r";
+                       $cmd = "zfs get all {$params['name']}";
                        break;
                default:
                        throw new OMVModuleZFSException("Incorrect type provided");