X-Git-Url: http://git.datanom.net/omvzfs.git/blobdiff_plain/13b8ca82f64b20c10fc6a814a5ae29c68b8b7a6f..4163f889aa50c1ee7f66ff9392ba600048221edb:/src/Utils.php diff --git a/src/Utils.php b/src/Utils.php index 13c89ed..cc0814b 100644 --- a/src/Utils.php +++ b/src/Utils.php @@ -8,20 +8,66 @@ require_once("Dataset.php"); */ class OMVModuleZFSUtil { + /** + * Get poolname from name of dataset/volume etc. + * + * @return string Name of the pool + */ + public static function getPoolname($name) { + $tmp = preg_split('/[\/]+/', $name); + return($tmp[0]); + } + /** * Get UUID of ZFS pool by name * * @return string UUID of the pool */ - public static function getUUIDbyName($name) { - preg_match('/^([A-Za-z0-9]+)\/?.*$/', $name, $result); - $name = $result[1]; - unset($result); - $cmd = "blkid -o full"; + public static function getUUIDbyName($poolname) { + $cmd = "zpool get guid " . $poolname . " 2>&1"; + OMVModuleZFSUtil::exec($cmd, $out, $res); + if (isset($out)) { + $headers = preg_split('/[\s]+/', $out[0]); + for ($i=0; $iget($xpath); + if (is_null($mountpoint)) { + $uuid = OMVUtil::uuid(); + $pool = new OMVModuleZFSZpool($name); + $dir = $pool->getMountPoint(); + $object = array( + "uuid" => $uuid, + "fsname" => $pooluuid, + "dir" => $dir, + "type" => "zfs", + "opts" => "rw,relatime,xattr", + "freq" => "0", + "passno" => "2" + ); + $xmlConfig->set("//system/fstab",array("mntent" => $object)); + $dispatcher = &OMVNotifyDispatcher::getInstance(); + $dispatcher->notify(OMV_NOTIFY_CREATE,"org.openmediavault.system.fstab.mntent", $object); } } return null; @@ -94,7 +140,7 @@ class OMVModuleZFSUtil { 'parentid'=>$prefix . $root . "/" . $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);