mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-05-12 07:10:52 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:limetech/dynamix-6.2

Browse Source
This commit is contained in:
Eric Schultz
2016-06-22 07:40:16 -05:00
parent c1589b13d9 f13c1db6ef
commit 8754359c23
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/dynamix.docker.manager/include/CreateDocker.php
+3 -3
View File
@@ -1483,11 +1483,11 @@ $showAdditionalInfo = '';
<input type="hidden" name="confDisplay[]" value="{6}">
<input type="hidden" name="confRequired[]" value="{7}">
<input type="hidden" name="confMask[]" value="{8}">
<table class="settings">
<table class="settings" style="padding-top: 18px;">
<tr>
<td class="{11}">{0}:</td>
<td class="{11}" style="vertical-align: top;">{0}:</td>
<td>
<input type="text" class="textPath" name="confValue[]" default="{2}" value="{9}" autocomplete="off" style="margin-top: 12px;" {11}>&nbsp;{10}
<input type="text" class="textPath" name="confValue[]" default="{2}" value="{9}" autocomplete="off" {11}>&nbsp;{10}
<div style='color:#C98C21;line-height:1.6em;'>{4}</div>
</td>
</tr>
plugins/dynamix/scripts/diagnostics
+1 -1
View File
@@ -147,7 +147,7 @@ else
// create SMART reports (suppress errors)
$disks = file_exists("$get/disks.ini") ? parse_ini_file("$get/disks.ini", true) : [];
include_once '/usr/local/emhttp/webGui/include/CustomMerge.php';
exec("ls -l /dev/disk/by-id/[au]* 2>/dev/null|awk '$0!~/-part/{split($11,a,\"/\");print a[3],substr($9,21)}'", $devices);
exec("ls -l /dev/disk/by-id/[asu]* 2>/dev/null|awk '$0!~/-part/{split($11,a,\"/\");print a[3],substr($9,21)}'", $devices);
foreach ($devices as $device) {
$disk = explode(' ',$device);
$type = '';