diff --git a/emhttp/plugins/dynamix/nchan/device_list b/emhttp/plugins/dynamix/nchan/device_list index 512f004f6..b399ccde4 100755 --- a/emhttp/plugins/dynamix/nchan/device_list +++ b/emhttp/plugins/dynamix/nchan/device_list @@ -686,11 +686,11 @@ function effective_fs_size(&$disk) { } function fs_info(&$disk,$online = false) { - global $display, $var; + global $display; $echo = []; if (empty(_var($disk,'fsStatus',''))) return ""; - if (_var($disk,'fsStatus')=='Mounted' && _var($var,'fsState') == 'Started') { + if (_var($disk,'fsStatus')=='Mounted') { $fsSize = effective_fs_size($disk); $echo[] = "".vfs_type($disk,$online).""; $echo[] = "".my_scale($fsSize*1024,$unit,-1)." $unit"; diff --git a/tests/stopped-array-utilization.php b/tests/stopped-array-utilization.php index 02bfd3e14..b372a343b 100644 --- a/tests/stopped-array-utilization.php +++ b/tests/stopped-array-utilization.php @@ -104,7 +104,8 @@ function assertNotContainsText(string $needle, string $haystack, string $message $navigationUsage = ob_get_clean(); assertContainsText('50%', $navigationUsage, 'Started arrays must keep showing the usage percentage.'); -$disk = [ +$bootPartition = [ + 'type' => 'Cache', 'fsStatus' => 'Mounted', 'fsType' => 'xfs', 'fsSize' => 100, @@ -112,12 +113,25 @@ function assertNotContainsText(string $needle, string $haystack, string $message 'fsFree' => 75, ]; $var['fsState'] = 'Stopped'; -$diskInfo = fs_info($disk, true); -assertContainsText('Mounted', $diskInfo, 'Stopped filesystems must keep showing their status.'); -assertNotContainsText('usage-disk', $diskInfo, 'Stopped filesystems must not show a usage bar.'); +$bootInfo = fs_info($bootPartition, true); +assertContainsText('25', $bootInfo, 'Stopped mounted boot partitions must show used space.'); +assertContainsText('75', $bootInfo, 'Stopped mounted boot partitions must show free space.'); +assertContainsText('usage-disk', $bootInfo, 'Stopped mounted boot partitions must show usage bars.'); + +$flashBootDisk = $bootPartition; +$flashBootDisk['type'] = 'Flash'; +$flashBootInfo = fs_info($flashBootDisk, true); +assertContainsText('25', $flashBootInfo, 'Stopped mounted flash boot devices must show used space.'); +assertContainsText('75', $flashBootInfo, 'Stopped mounted flash boot devices must show free space.'); + +$dataPartition = $bootPartition; +$dataPartition['fsStatus'] = 'Unmounted'; +$dataInfo = fs_info($dataPartition, true); +assertContainsText('Unmounted', $dataInfo, 'Stopped unmounted data partitions must show their status.'); +assertNotContainsText('usage-disk', $dataInfo, 'Stopped unmounted data partitions must not show a usage bar.'); $var['fsState'] = 'Started'; -$diskInfo = fs_info($disk, true); +$diskInfo = fs_info($bootPartition, true); assertContainsText('usage-disk', $diskInfo, 'Started filesystems must keep showing a usage bar.'); echo "Stopped array utilization regression test passed.\n";