Hide filesystems with same name as pool.

[omvzfs.git] / src / Zpool.php

diff --git a/src/Zpool.php b/src/Zpool.php
index c8d4ae97fe73d09f39719fb61280e2c27f484f4d..0ef151512ce2e6e73708cc9a232fc9f058889758 100644 (file)
--- a/src/Zpool.php
+++ b/src/Zpool.php
@@ -16,8 +16,7 @@ require_once("Exception.php");
  * @version   0.1
  * @copyright Michael Rasmussen <mir@datanom.net>
  */
  * @version   0.1
  * @copyright Michael Rasmussen <mir@datanom.net>
  */

-class OMVModuleZFSZpool extends OMVModuleAbstract
-               implements OMVINotifyListener {
+class OMVModuleZFSZpool extends OMVModuleAbstract {

     // Attributes
     /**
      * Name of pool
     // Attributes
     /**
      * Name of pool


@@ -123,7 +122,7 @@ class OMVModuleZFSZpool extends OMVModuleAbstract
      * @throws OMVModuleZFSException
         */
 
      * @throws OMVModuleZFSException
         */
 

-       public function __construct($vdev) {
+       public function __construct($vdev, $opts = "") {

                $create_pool = true;
 
                if (is_array($vdev)) {
                $create_pool = true;
 
                if (is_array($vdev)) {


@@ -145,7 +144,7 @@ class OMVModuleZFSZpool extends OMVModuleAbstract
                $this->cache = null;
                $this->features = array();
                if ($create_pool) {
                $this->cache = null;
                $this->features = array();
                if ($create_pool) {

-                       $cmd = "zpool create $name $cmd 2>&1";
+                       $cmd = "zpool create $opts$name $cmd 2>&1";

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


@@ -525,70 +524,6 @@ class OMVModuleZFSZpool extends OMVModuleAbstract
                        throw new OMVModuleZFSException($output);
     }
 
                        throw new OMVModuleZFSException($output);
     }
 

-    public function bindListeners(OMVNotifyDispatcher $dispatcher) {
-               // Update service if configuration has been modified
-               $dispatcher->addListener(
-                 OMV_NOTIFY_MODIFY,
-                 "org.openmediavault.services.nfs",
-                 array($this, "onUpdateNFSService"));
-               $dispatcher->addListener(
-                 OMV_NOTIFY_CREATE,
-                 "org.openmediavault.services.nfs.shares.share",
-                 array($this, "onCreateNFSShare"));
-               $dispatcher->addListener(
-                 OMV_NOTIFY_DELETE,
-                 "org.openmediavault.services.nfs.shares.share",
-                 array($this, "onDeleteNFSShare"));
-               $dispatcher->addListener(
-                 OMV_NOTIFY_MODIFY,
-                 "org.openmediavault.services.nfs.shares.share",
-                 array($this, "onUpdateNFSShare"));
-    }
-
-       /**
-        * XXX
-        * org.openmediavault.services.nfs
-        *
-        * @param string event
-        * @access public
-        */
-       public function onUpdateNFSService($args) {
-        $this->debug(sprintf("onUpdateNFSService args=%s", var_export($args, true)));
-       }
-
-       /**
-        * XXX
-        * org.openmediavault.services.nfs.shares.share
-        *
-        * @param string event
-        * @access public
-        */
-       public function onCreateNFSShare($args) {
-        $this->debug(sprintf("onCreateNFSShare args=%s", var_export($args, true)));
-       }
-
-       /**
-        * XXX
-        * org.openmediavault.services.nfs.shares.share
-        *
-        * @param string event
-        * @access public
-        */
-       public function onDeleteNFSShare($args) {
-        $this->debug(sprintf("onDeleteNFSShare args=%s", var_export($args, true)));
-       }
-
-       /**
-        * XXX
-        * org.openmediavault.services.nfs.shares.share
-        *
-        * @param string event
-        * @access public
-        */
-       public function onUpdateNFSShare($args) {
-        $this->debug(sprintf("onUpdateNFSShare args=%s", var_export($args, true)));
-       }
-

        /**
         * Get a single property value associated with the Dataset
         *
        /**
         * Get a single property value associated with the Dataset
         *


@@ -911,5 +846,4 @@ class OMVModuleZFSZpool extends OMVModuleAbstract
        }
 
 }
        }
 
 }

-

 ?>
 ?>