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']);
}
public function deleteObject($params, $context) {
$this->validateMethodContext($context, array("role" => OMV_ROLE_ADMINISTRATOR));
+ global $xmlConfig;
+ $name = $params['name'];
switch ($params['type']) {
case "Filesystem":
- $name = $params['name'];
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']);
require_once("Exception.php");
require_once("openmediavault/util.inc");
require_once("Dataset.php");
+require_once("Vdev.php");
+require_once("Zpool.php");
/**
* Helper class for ZFS module
*/
class OMVModuleZFSUtil {
+ /**
+ * Clears all ZFS labels on specified devices.
+ * Needed for blkid to display proper data.
+ *
+ */
+ public static function clearZFSLabel($disks) {
+ foreach ($disks as $disk) {
+ $cmd = "zpool labelclear /dev/" . $disk . "1";
+ OMVModuleZFSUtil::exec($cmd,$out,$res);
+ }
+ }
+
+ /**
+ * Return all disks in /dev/sdXX used by the pool
+ *
+ * @return array An array with all the disks
+ */
+ public static function getDevDisksByPool($name) {
+ $pool = new OMVModuleZFSZpool($name);
+ $disks = array();
+ $vdevs = $pool->getVdevs();
+ foreach ($vdevs as $vdev) {
+ $vdisks = $vdev->getDisks();
+ foreach ($vdisks as $vdisk) {
+ if (preg_match('/^[a-z0-9]+$/', $vdisk)) {
+ $disks[] = $vdisk;
+ continue;
+ }
+ $cmd = "ls -la /dev/disk/by-path/" . $vdisk;
+ unset($out);
+ OMVModuleZFSUtil::exec($cmd,$out,$res);
+ if (count($out) === 1) {
+ if (preg_match('/^.*\/([a-z0-9]+)$/', $out[0], $match)) {
+ $disks[] = $match[1];
+ }
+ }
+ }
+ }
+ return($disks);
+ }
+
/**
* Deletes all shared folders pointing to the specifc path
*
$mountpoint = $xmlConfig->get($xpath);
$mntentuuid = $mountpoint['uuid'];
$xpath = "//system/shares/sharedfolder[mntentref='" . $mntentuuid . "' and reldirpath='" . $reldirpath . "']";
+ $object = $xmlConfig->get($xpath);
$xmlConfig->delete($xpath);
$dispatcher = &OMVNotifyDispatcher::getInstance();
- $dispatcher->notify(OMV_NOTIFY_CREATE,"org.openmediavault.system.shares.sharedfolder");
+ $dispatcher->notify(OMV_NOTIFY_DELETE,"org.openmediavault.system.shares.sharedfolder",$object);
}
/**