Add option to set mountpoint when creating pool.

Signed-off-by: Niclas Berglind <nb@kjam.se>

diff --git a/gui/js/omv/module/admin/storage/zfs/Overview.js b/gui/js/omv/module/admin/storage/zfs/Overview.js
index 22f74dbf3f97235e374268accdf870bec91870bb..f2357996f754cd0d11cacb49b891ec4bfca062a8 100644 (file)
--- a/gui/js/omv/module/admin/storage/zfs/Overview.js
+++ b/gui/js/omv/module/admin/storage/zfs/Overview.js
@@ -136,6 +136,14 @@ Ext.define("OMV.module.admin.storage.zfs.AddPool", {
                                        flex: 1
                                }]
                        }
+               },{
+                       xtype: "textfield",
+                       name: "mountpoint",
+                       fieldLabel: _("Mountpoint"),
+                       plugins: [{
+                               ptype: "fieldinfo",
+                               text: _("Optional mountpoint for the pool. Default is to use pool name.")
+                       }]
                },{
                        xtype: "checkbox",
                        name: "force",

diff --git a/gui/rpc/zfs.inc b/gui/rpc/zfs.inc
index 3bc3ec117d4fca266e5b056add8f5eb38dfc8aff..16b5a133183afa56dc2a56a2ac8256a6be0d5bdb 100644 (file)
--- a/gui/rpc/zfs.inc
+++ b/gui/rpc/zfs.inc
@@ -59,6 +59,10 @@ class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
                if ($params['force']) {
                        $opts .= "-f ";
                }
+               if (strlen($params['mountpoint']) > 0) {
+                       $opts .= "-m " . $params['mountpoint'] . " ";
+               }
+
                $disks = preg_split("/[,;]/", $params['devices']);
                $vdev = new OMVModuleZFSVdev($params['name'], $pooltype, $disks);
                $pool = new OMVModuleZFSZpool($vdev, $opts);