merge get_smart_data/health

instead of parsing the output of smart in two places,
give get_smart_data a flag if we only want health

this fixes a bug (not on the bugtracker), where
an ssd with disabled smart had an empty string as health
in the gui

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak
2016-10-05 10:57:09 +02:00
committed by Dietmar Maurer
parent daa623edc3
commit dd902da78e
2 changed files with 13 additions and 36 deletions

View File

@ -140,13 +140,10 @@ __PACKAGE__->register_method ({
my $result = {};
if ($param->{healthonly}) {
$result = { health => PVE::Diskmanage::get_smart_health($disk) };
} else {
$result = PVE::Diskmanage::get_smart_data($disk);
}
my $result = PVE::Diskmanage::get_smart_data($disk, $param->{healthonly});
$result->{health} = 'UNKNOWN' if !defined $result->{health};
$result = { health => $result->{health} } if $param->{healthonly};
return $result;
}});