diff --git a/mxraid/mxraid_assemble b/mxraid/mxraid_assemble index be43a8a..3d5bc18 100755 --- a/mxraid/mxraid_assemble +++ b/mxraid/mxraid_assemble @@ -14,7 +14,7 @@ import MxRaid::HostData; import MxRaid::Utils; import MxRaid::Color; -my $VERSION = '1.1'; +my $VERSION = '1.2'; sub exec_usage { @@ -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; @@ -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; } @@ -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; } }