diff --git a/emhttp/plugins/dynamix/nchan/device_list b/emhttp/plugins/dynamix/nchan/device_list index cbebd2903..fd1fd51e9 100755 --- a/emhttp/plugins/dynamix/nchan/device_list +++ b/emhttp/plugins/dynamix/nchan/device_list @@ -146,17 +146,17 @@ function vfs_type($fs) { function vfs_luks($fs) { return ($fs != vfs_type($fs)); } -function vfs_info($fs) { - $fs = vfs_type($fs); - return $fs; // no special action on reiserfs (may come in future) +function vfs_parent($name) { + global $disks; + return vfs_type(_var($disks[prefix($name)],'fsType')); } function fs_info(&$disk) { global $display, $pools; $echo = []; if (empty($disk['fsStatus']) || $disk['fsStatus']=='-') { - return (_var($disk,'type')=='Cache' && !in_array(_var($disk,'name'),$pools)) ? ""._('Device is part of a pool')."" : ""; + return (_var($disk,'type')=='Cache' && !in_array(_var($disk,'name'),$pools)) ? "".vfs_parent(_var($disk,'name')).""._('Device is part of a pool')."" : ""; } elseif (_var($disk,'fsStatus')=='Mounted') { - $echo[] = "".vfs_info(_var($disk,'fsType')).""; + $echo[] = "".vfs_type(_var($disk,'fsType')).""; $echo[] = "".my_scale(_var($disk,'fsSize',0)*1024,$unit,-1)." $unit"; if ($display['text']%10==0) { $echo[] = "".my_scale(_var($disk,'fsUsed',0)*1024,$unit)." $unit"; @@ -171,7 +171,7 @@ function fs_info(&$disk) { $echo[] = "
".my_scale(_var($disk,'fsFree',0)*1024,$unit)." $unit
"; } } else { - $echo[] = "".vfs_info(_var($disk,'fsType')).""._(_var($disk,'fsStatus')).""; + $echo[] = "".vfs_type(_var($disk,'fsType')).""._(_var($disk,'fsStatus')).""; } return implode($echo); }