X-Git-Url: http://git.datanom.net/omvzfs.git/blobdiff_plain/a36352f77c28bdf8f2834a64bd8520b73bfcf040..2d44d88394aa1d612c8324ceaab7b8fb0fbe8357:/src/Utils.php diff --git a/src/Utils.php b/src/Utils.php index 251157a..579d53c 100644 --- a/src/Utils.php +++ b/src/Utils.php @@ -8,21 +8,84 @@ require_once("Dataset.php"); */ class OMVModuleZFSUtil { + /** + * Deletes all shared folders pointing to the specifc path + * + */ + public static function deleteShares($name) { + global $xmlConfig; + $tmp = new OMVModuleZFSDataset($name); + $reldirpath = OMVModuleZFSUtil::getReldirpath($tmp->getMountPoint()); + $poolname = OMVModuleZFSUtil::getPoolname($name); + $pooluuid = OMVModuleZFSUtil::getUUIDbyName($poolname); + $xpath = "//system/fstab/mntent[fsname='" . $pooluuid . "']"; + $mountpoint = $xmlConfig->get($xpath); + $mntentuuid = $mountpoint['uuid']; + $xpath = "//system/shares/sharedfolder[mntentref='" . $mntentuuid . "' and reldirpath='" . $reldirpath . "']"; + $xmlConfig->delete($xpath); + $dispatcher = &OMVNotifyDispatcher::getInstance(); + $dispatcher->notify(OMV_NOTIFY_CREATE,"org.openmediavault.system.shares.sharedfolder"); + } + + /** + * Get the relative path by complete path + * + * @return string Relative path of the complet path + */ + public static function getReldirpath($path) { + $subdirs = preg_split('/\//',$path); + $reldirpath = ""; + for ($i=2;$i&1"; OMVModuleZFSUtil::exec($cmd, $out, $res); - foreach($out as $line) { - if(preg_match('/^.*LABEL=\"' . $name . '\" UUID=\"([A-Za-z0-9]+)\".*TYPE=\"zfs_member\"$/', $line, $result)) { - return($result[1]); + if (isset($out)) { + $headers = preg_split('/[\s]+/', $out[0]); + for ($i=0; $iget($xpath); - if(is_null($object)) { + $xpath = "//system/fstab/mntent[fsname='" . $pooluuid . "']"; + $mountpoint = $xmlConfig->get($xpath); + if (is_null($mountpoint)) { $uuid = OMVUtil::uuid(); - $ds = new OMVModuleZFSDataset($name); - $dir = $ds->getMountPoint(); + $pool = new OMVModuleZFSZpool($name); + $dir = $pool->getMountPoint(); $object = array( "uuid" => $uuid, "fsname" => $pooluuid, "dir" => $dir, "type" => "zfs", - "opts" => "rw,relatime,xattr", + "opts" => "rw,relatime,xattr,noacl", "freq" => "0", - "passno" => "2" + "passno" => "0" ); $xmlConfig->set("//system/fstab",array("mntent" => $object)); $dispatcher = &OMVNotifyDispatcher::getInstance(); @@ -83,7 +145,7 @@ class OMVModuleZFSUtil { switch ($type) { case "filesystem": if (strpos($path,'/') === false) { - //This is a Pool, thus create both the Pool entry and a Filesystem entry corresponding to the Pool. + //This is a Pool $tmp = array('id'=>$prefix . $path, 'parentid'=>'root', 'name'=>$path, @@ -92,19 +154,11 @@ class OMVModuleZFSUtil { 'expanded'=>$expanded, 'path'=>$path); array_push($objects,$tmp); - $tmp = array('id'=>$prefix . $path . '/' . $path, - 'parentid'=>$prefix . $path, - 'name'=>$path, - 'type'=>'Filesystem', - 'icon'=>'images/filesystem.png', - 'path'=>$path, - 'expanded'=>$expanded); - array_push($objects,$tmp); } else { - //This is a Filesystem other than the Pool + //This is a Filesystem preg_match('/(.*)\/(.*)$/', $path, $result); - $tmp = array('id'=>$prefix . $root . "/" . $path, - 'parentid'=>$prefix . $root . "/" . $result[1], + $tmp = array('id'=>$prefix . $path, + 'parentid'=>$prefix . $result[1], 'name'=>$result[2], 'icon'=>"images/filesystem.png", 'path'=>$path, @@ -124,11 +178,11 @@ class OMVModuleZFSUtil { case "volume": preg_match('/(.*)\/(.*)$/', $path, $result); - $tmp = array('id'=>$prefix . $root . "/" . $path, - 'parentid'=>$prefix . $root . "/" . $result[1], + $tmp = array('id'=>$prefix . $path, + 'parentid'=>$prefix . $result[1], 'name'=>$result[2], 'type'=>ucfirst($type), - 'icon'=>"images/zfs_disk.png", + 'icon'=>"images/save.png", 'path'=>$path, 'expanded'=>$expanded); array_push($objects,$tmp); @@ -138,8 +192,8 @@ class OMVModuleZFSUtil { preg_match('/(.*)\@(.*)$/', $path, $result); $subdirs = preg_split('/\//',$result[1]); $root = $subdirs[0]; - $tmp = array('id'=>$prefix . $root . "/" . $path, - 'parentid'=>$prefix . $root . "/" . $result[1], + $tmp = array('id'=>$prefix . $path, + 'parentid'=>$prefix . $result[1], 'name'=>$result[2], 'type'=>ucfirst($type), 'icon'=>'images/zfs_snap.png',