Cleanup of OMV when deleting pools.

[omvzfs.git] / gui / rpc / zfs.inc

diff --git a/gui/rpc/zfs.inc b/gui/rpc/zfs.inc
index af69ec4d6f7492cdc897d8be92476fbad0d68399..91c7e19a4a68669508ae087d264c20142c2631aa 100644 (file)
--- a/gui/rpc/zfs.inc
+++ b/gui/rpc/zfs.inc
@@ -94,8 +94,6 @@ class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
 
        public function passParam($params, $context) {
                $this->validateMethodContext($context, array("role" => OMV_ROLE_ADMINISTRATOR));
-               //$msg = "Key=" . $params['key'] . ";Value=" . $params['value'] . ";";
-               //throw new OMVModuleZFSException($msg);
                return array($params['key'] => $params['value']);
        }
 
@@ -123,27 +121,37 @@ class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
 
        public function deleteObject($params, $context) {
                $this->validateMethodContext($context, array("role" => OMV_ROLE_ADMINISTRATOR));
+               global $xmlConfig;
+               $name = $params['name'];
                switch ($params['type']) {
                case "Filesystem":
+                       OMVModuleZFSUtil::deleteShares($name);
+                       $tmp = new OMVModuleZFSDataset($name);
+                       $tmp->destroy();
+                       break;
                case "Clone":
-                       $name = $params['name'];
                        $tmp = new OMVModuleZFSDataset($name);
                        $tmp->destroy();
                        break;
                case "Snapshot":
-                       $name = $params['name'];
                        $tmp = new OMVModuleZFSSnapshot($name);
                        $tmp->destroy();
                        break;
                case "Volume":
-                       $name = $params['name'];
                        $tmp = new OMVModuleZFSZvol($name);
                        $tmp->destroy();
                        break;
                case "Pool":
-                       $name = $params['name'];
+                       $disks = OMVModuleZFSUtil::getDevDisksByPool($name);
+                       $pooluuid = OMVModuleZFSUtil::getUUIDbyName($name);
                        $tmp = new OMVModuleZFSZpool($name);
                        $tmp->destroy();
+                       $xpath = "//system/fstab/mntent[fsname='" . $pooluuid . "' and type='zfs']";
+                       $object = $xmlConfig->get($xpath);
+                       $xmlConfig->delete($xpath);
+                       $dispatcher = &OMVNotifyDispatcher::getInstance();
+                       $dispatcher->notify(OMV_NOTIFY_DELETE,"org.openmediavault.system.fstab.mntent", $object);
+                       OMVModuleZFSUtil::clearZFSLabel($disks);
                        break;
                default:
                        throw new OMVModuleZFSException("Illegal type provided: " . $params['type']);
@@ -272,7 +280,7 @@ class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
                $pooluuid = OMVModuleZFSUtil::getUUIDbyName($poolname);
 
                //Get the mntent object and fetch it's uuid.
-               $xpath = "//system/fstab/mntent[fsname=" . $pooluuid . "]";
+               $xpath = "//system/fstab/mntent[fsname='" . $pooluuid . "']";
                $mountpoint = $xmlConfig->get($xpath);
                $mntentref = $mountpoint['uuid'];
 
@@ -292,12 +300,7 @@ class OMVRpcServiceZFS extends OMVRpcServiceAbstract {
 
                $uuid = OMVUtil::uuid();
                $pathName = $tmp->getMountPoint();
-               $subdirs = preg_split('/\//',$pathName);
-               $reldirpath = "";
-               for ($i=2;$i<count($subdirs);$i++) {
-                       $reldirpath .= $subdirs[$i] . "/";
-               }
-               $reldirpath = rtrim($reldirpath, "/");
+               $reldirpath = OMVModuleZFSUtil::getReldirpath($pathName);
                $object = array(
                        "uuid" => $uuid,
                        "name" => $params['sharename'],