michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-02-03 14:13:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:webmin/webmin

Browse Source
This commit is contained in:
Jamie Cameron
2019-10-04 22:36:12 -07:00
parent 4810b7a02b f0ab457cc5
commit d8bf92b6ae
3 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cron/config.info
View File

@@ -2,7 +2,7 @@ line1=Configurable options,11
max_len=Maximum command length to display,3,Unlimited
max_jobs=Maximum Cron jobs to show,3,Unlimited
show_time=Show job schedules?,1,1-Yes,0-No
show_comment=Show job comments?,1,1-Yes,0-No
show_comment=Show job description?,1,1-Yes,0-No
show_run=Display running status of jobs?,1,2-Yes, and allow starting and stopping,1-Yes,0-No
show_next=Show next time each job will run?,1,1-Yes,0-No
match_mode=Find job processes by,1,1-Command only,0-Command and arguments

5
smart-status/smart-status-lib.pl
View File

@@ -401,6 +401,11 @@ if ($config{'attribs'}) {
push(@attribs, [ $2, $10, undef, $4 ]);
$attribs[$#attribs]->[0] =~ s/_/ /g;
}
elsif (/^(?|(\w+.*):\s+([0-9]+(,[0-9]+)+)|(\w+.*):\s+(\d+x\d+)|(\w+.*):\s+(\d+%)|^(\w+.*):\s+(\d+))/) {
# NVME style
$doneknown = 1;
push(@attribs, [ $1, $2, undef, undef ]);
}
elsif (/^(\S.*\S):\s+\(\s*(\S+)\)\s*(.*)/ && !$doneknown) {
# A known attribute
local $attrib = [ $1, $2, $3 ];

1
system-status/system-status-lib.pl
View File

@@ -428,6 +428,7 @@ if (!$config{'collect_notemp'} &&
my $st = &smart_status::get_drive_status($d->{'device'}, $d);
foreach my $a (@{$st->{'attribs'}}) {
if (($a->[0] =~ /^Temperature\s+Celsius$/i ||
$a->[0] =~ /^Temperature$/i ||
$a->[0] =~ /^Airflow\s+Temperature\s+Cel/i) &&
$a->[1] > 0) {
push(@rv, { 'device' => $d->{'device'},