More info displayed for pools.

[omvzfs.git] / src / Zpool.php

diff --git a/src/Zpool.php b/src/Zpool.php
index 87e5f0cb4637e88badb4eab36aa32e394e896469..56ec8c64d4426e98d239710d5e3d8b70448c24d5 100644 (file)
--- a/src/Zpool.php
+++ b/src/Zpool.php
@@ -192,11 +192,11 @@ class OMVModuleZFSZpool extends OMVModuleAbstract {
      * @throws OMVModuleZFSException
      * @access public
      */
      * @throws OMVModuleZFSException
      * @access public
      */

-    public function addVdev(array $vdevs) {
-               $cmd = "zpool add " . $this->name . " " . $this->getCommandString($vdevs);
+    public function addVdev(array $vdevs, $opts= "") {
+               $cmd = "zpool add " . $this->name . " " . $opts . $this->getCommandString($vdevs) . " 2>&1";

                OMVUtil::exec($cmd, $output, $result);
                if ($result)
                OMVUtil::exec($cmd, $output, $result);
                if ($result)

-                       throw new OMVModuleZFSException($output);
+                       throw new OMVModuleZFSException(implode("\n", $output));

                else
                        $this->vdevs = array_merge($this->vdevs, $vdevs);
                $this->size = $this->getAttribute("size");
                else
                        $this->vdevs = array_merge($this->vdevs, $vdevs);
                $this->size = $this->getAttribute("size");