Skip to content
Jump to bottom

Fix mxraid assemble smartctl call #309

Merged
merged 3 commits into from
Feb 16, 2023
Merged

Fix mxraid assemble smartctl call #309

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
76d03b6
mxraid/mxraid_assemble: Add a comment for disk key regex
thomas Feb 16, 2023
00cfc1f
mxraid/mxraid_assemble: Fix smartctl callup
thomas Feb 16, 2023
9cb66bb
mxraid/mxraid_assemble: Raise version to 1.2
thomas Feb 16, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions mxraid/mxraid_assemble
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ import MxRaid::HostData;
import MxRaid::Utils;
import MxRaid::Color;

my $VERSION = '1.1';
my $VERSION = '1.2';

sub exec_usage {

Expand Down Expand Up @@ -712,7 +712,7 @@ exit;
my @ret;
my $num = scalar @$dev_list;
for (my $i=0; $i<$num; $i++) {
my ($dk) = $dev_list->[$i] =~ m|([^/]+)$|;
my ($dk) = $dev_list->[$i] =~ m|([^/]+)$|; # '/sys/block/sda' -> 'sda'

my $model = sys_fs_get_prop('/sys/block/'.$dk.'/device/model');
my $sizeb = sys_fs_get_prop('/sys/block/'.$dk.'/size') * 512;
Expand All @@ -735,7 +735,7 @@ exit;
$serial_number =~ s/^\s+//;
} else {
if ($self->{root_priv}) {
$serial_number = smartctl_info($dev_list->[$i], 'Serial_Number');
$serial_number = smartctl_info('/dev/'.$dk, 'Serial_Number');
} else {
warn "# You must be root to query '$dk'.\n" if $self->{verbose} >= 1;
}
Expand Down Expand Up @@ -801,6 +801,7 @@ exit;
if ($parse) {
my ($key, $val) = $_ =~ m/^([^:]+):\s*(.+)$/;
next unless defined $key and defined $val;
$key =~ s/\s+/_/g;
$smart_data{$key} = $val;
}
}
Expand Down