yesBad/pve-storage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use model from udevadm

Browse Source 
we want this, because the model in /sys/block/<device>/device/model
is limited to 16 characters

and since the model is not always in the udevadm output (nvme),
also read the model from the model file as fallback

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak
2016-10-17 10:29:11 +02:00
committed by Dietmar Maurer
parent 10a48db55c
commit 865bdbd917
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
PVE/Diskmanage.pm
View File

@ -255,6 +255,10 @@ sub get_udev_info {
$data->{usb} = 1; $data->{usb} = 1;
} }
if ($info =~ m/^E: ID_MODEL=(.+)$/m) {
$data->{model} = $1;
}
$data->{wwn} = 'unknown'; $data->{wwn} = 'unknown';
if ($info =~ m/^E: ID_WWN=(.*)$/m) { if ($info =~ m/^E: ID_WWN=(.*)$/m) {
$data->{wwn} = $1; $data->{wwn} = $1;
@ -413,7 +417,7 @@ sub get_disks {
if ($type eq 'ssd') { if ($type eq 'ssd') {
# if we have an ssd we try to get the wearout indicator # if we have an ssd we try to get the wearout indicator
my $wearval = get_wear_leveling_info($smartdata->{attributes}, $sysdata->{model}); my $wearval = get_wear_leveling_info($smartdata->{attributes}, $data->{model} || $sysdir->{model});
$wearout = $wearval if $wearval; $wearout = $wearval if $wearval;
} }
}; };
@ -429,7 +433,7 @@ sub get_disks {
$disklist->{$dev} = { $disklist->{$dev} = {
vendor => $sysdata->{vendor}, vendor => $sysdata->{vendor},
model => $sysdata->{model}, model => $data->{model} || $sysdata->{model},
size => $sysdata->{size}, size => $sysdata->{size},
serial => $data->{serial}, serial => $data->{serial},
gpt => $data->{gpt}, gpt => $data->{gpt},