mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-05-21 21:59:27 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #234 from bergware/6.4-wip

Browse Source 
Fixed SMART reports and tests on unassigned devices
This commit is contained in:
tom mortensen
2017-12-24 13:43:06 -08:00
committed by GitHub
parent 9e9459d9ca 6c15fc99da
commit e033e5c32e
3 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/dynamix/DeviceInfo.page
+1
View File
@@ -17,6 +17,7 @@ Tag="hdd-o"
<?
require_once "$docroot/webGui/include/Preselect.php";
$disk = &$disks[$name];
$date = date('Ymd-Hi');
$events = explode('|',$disk['smEvents'] ?? $var['smEvents'] ?? $numbers);
function displayTemp($temp) {
plugins/dynamix/Selftest.page
+9 -1
View File
@@ -16,10 +16,18 @@ Cond="strpos($disks[$name]['status'],'_NP')===false"
*/
?>
<?
$date = date('Ymd-Hi');
$date = $date ?? date('Ymd-Hi');
$live = exec("hdparm -C ".escapeshellarg("/dev/$dev")."|grep -Pom1 'active|unknown'");
$zip = str_replace(' ','_',strtolower($var['NAME']))."-smart-$date.zip";
// deal with unassigned devices
if (!$dev) {
$dev = $name;
foreach ($devs as $disk) {
if ($disk['device']==$name) {$file = $disk['id']."-$date.txt"; break;}
}
}
function spindownDelay() {
global $spindown, $delay;
$tmp = "/var/tmp/$spindown";
plugins/dynamix/include/DeviceList.php
+2 -2
View File
@@ -60,8 +60,8 @@ function device_info(&$disk,$online) {
$link = ($disk['type']=='Parity' && strpos($disk['status'],'_NP')===false) ||
($disk['type']=='Data' && $disk['status']!='DISK_NP') ||
($disk['type']=='Cache' && $disk['status']!='DISK_NP') ||
($disk['name']=='cache') ||
($disk['name']=='flash') ? "<a href=\"".htmlspecialchars("$path/$type?name=$name")."\">".$fancyname."</a>" : $fancyname;
($disk['name']=='cache') || ($disk['name']=='flash') ||
$disk['type']=='New' ? "<a href=\"".htmlspecialchars("$path/$type?name=$name")."\">".$fancyname."</a>" : $fancyname;
if ($crypto) switch ($disk['luksState']) {
case 0:
if (!vfs_luks($disk['fsType']))