Create GPT label before creating/expanding pools.

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

diff --git a/gui/rpc/zfs.inc b/gui/rpc/zfs.inc
index 9ab61a2e7c8d60e844cd6bc2de8fa31374a7c971..22011e4ada941ab42311e14d103a9e052cff146a 100644 (file)
--- a/gui/rpc/zfs.inc
+++ b/gui/rpc/zfs.inc
@@ -79,6 +79,9 @@ class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
                }
 
                $disks = preg_split("/[,;]/", $params['devices']);
                }
 
                $disks = preg_split("/[,;]/", $params['devices']);

+               foreach ($disks as $disk) {
+                       OMVModuleZFSUtil::setGPTLabel($disk);
+               }

                //Use /dev/disk/by-path as suggested in ZoL FAQ.
                if ($params['diskpath']) {
                        try {
                //Use /dev/disk/by-path as suggested in ZoL FAQ.
                if ($params['diskpath']) {
                        try {


@@ -583,6 +586,9 @@ class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
                        $opts .= "-f ";
                }
                $disks = preg_split("/[,;]/", $params['devices']);
                        $opts .= "-f ";
                }
                $disks = preg_split("/[,;]/", $params['devices']);

+               foreach ($disks as $disk) {
+                       OMVModuleZFSUtil::setGPTLabel($disk);
+               }

                //Use /dev/disk/by-path as suggested in ZoL FAQ.
                if ($params['diskpath']) {
                        try {
                //Use /dev/disk/by-path as suggested in ZoL FAQ.
                if ($params['diskpath']) {
                        try {

diff --git a/src/Utils.php b/src/Utils.php
index c7049dc752a570042ac2cb799e15db8ea689f2c3..4ccf60f8f58b776dbcd48814d51ae7419040bb5f 100644 (file)
--- a/src/Utils.php
+++ b/src/Utils.php
@@ -11,6 +11,16 @@ require_once("Zpool.php");
  */
 class OMVModuleZFSUtil {
 
  */
 class OMVModuleZFSUtil {
 

+       /**
+        * Sets a GPT label on a disk to prevent the zpool command from generating
+        * errors.
+        *
+        */
+       public static function setGPTLabel($disk) {
+               $cmd = "parted " . $disk . " mklabel gpt 2>&1";
+               OMVModuleZFSUtil::exec($cmd,$out,$res);
+       }
+

        /**
         * Manages relocation of ZFS filesystem mountpoints in the OMV backend.
         * Needed when the user changes mountpoint of a filesystem in the GUI.
        /**
         * Manages relocation of ZFS filesystem mountpoints in the OMV backend.
         * Needed when the user changes mountpoint of a filesystem in the GUI.