X-Git-Url: http://git.datanom.net/omvzfs.git/blobdiff_plain/4163f889aa50c1ee7f66ff9392ba600048221edb..5627dfd7773fc58ee6615ea7d6bb93dfbc28ab02:/src/Utils.php diff --git a/src/Utils.php b/src/Utils.php index cc0814b..f997041 100644 --- a/src/Utils.php +++ b/src/Utils.php @@ -8,6 +8,22 @@ require_once("Dataset.php"); */ class OMVModuleZFSUtil { + /** + * Get /dev/disk/by-path from /dev/sdX + * + * @return string Disk identifier + */ + public static function getDiskPath($disk) { + preg_match("/^.*\/([A-Za-z0-9]+)$/", $disk, $identifier); + $cmd = "ls -la /dev/disk/by-path | grep '$identifier[1]$'"; + OMVModuleZFSUtil::exec($cmd, $out, $res); + if (is_array($out)) { + $cols = preg_split('/[\s]+/', $out[0]); + return($cols[count($cols)-3]); + } + } + + /** * Get poolname from name of dataset/volume etc. * @@ -95,7 +111,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, @@ -104,19 +120,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, @@ -136,8 +144,8 @@ 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/save.png", @@ -150,8 +158,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',