Made it optional to use /dev/disk/by-path

[omvzfs.git] / src / NotifyListener.php

diff --git a/src/NotifyListener.php b/src/NotifyListener.php
index 5f55bd09103ffaca2337aca01fdc8f93911d5728..42c4fceb1ea3bfd025b271b2e877ae67619cc1ba 100644 (file)
--- a/src/NotifyListener.php
+++ b/src/NotifyListener.php
@@ -42,6 +42,7 @@ class OMVModuleZFS extends OMVModuleAbstract
                  OMV_NOTIFY_MODIFY,
                  "org.openmediavault.services.nfs.shares.share",
                  array($this, "onUpdateNFSShare"));
                  OMV_NOTIFY_MODIFY,
                  "org.openmediavault.services.nfs.shares.share",
                  array($this, "onUpdateNFSShare"));

+               $this->debug(sprintf("bindListeners %s", var_export($dispatcher, true)));

     }
 
        /**
     }
 
        /**


@@ -88,25 +89,6 @@ class OMVModuleZFS extends OMVModuleAbstract
         $this->debug(sprintf("onUpdateNFSShare args=%s", var_export($args, true)));
        }
 
         $this->debug(sprintf("onUpdateNFSShare args=%s", var_export($args, true)));
        }
 

-       /**
-        * Helper function to execute a command and throw an exception on error
-        * (requires stderr redirected to stdout for proper exception message).
-        *
-        * @param string $cmd Command to execute
-        * @param array &$out If provided will contain output in an array
-        * @param int &$res If provided will contain Exit status of the command
-        * @return string Last line of output when executing the command
-        * @throws OMVModuleZFSException
-        * @access public
-        */
-       private function exec($cmd, &$out = null, &$res = null) {
-               $tmp = OMVUtil::exec($cmd, $out, $res);
-               if ($res) {
-                       throw new OMVModuleZFSException(implode("\n", $out));
-               }
-               return $tmp;
-       }
-

        private function updatePools() {
 
        }
        private function updatePools() {
 
        }