diff options
Diffstat (limited to 'perl-install/detect_devices.pm')
| -rw-r--r-- | perl-install/detect_devices.pm | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm index 1f797fccf..0d516ed3a 100644 --- a/perl-install/detect_devices.pm +++ b/perl-install/detect_devices.pm @@ -933,12 +933,9 @@ sub dmidecode_category { sub dmi_detect_memory() { my @l1 = map { $_->{'Enabled Size'} =~ /(\d+) MB/ && $1 } dmidecode_category('Memory Module'); my @l2 = map { $_->{'Form Factor'} =~ /^(SIMM|SIP|DIP|DIMM|RIMM|SODIMM|SRIMM)$/ && - ($_->{Size} =~ /(\d+) MB/ && $1 || $_->{Size} =~ /(\d+) kB/ && $1 * 1024) + ($_->{Size} =~ /(\d+) MB/ && $1 || $_->{Size} =~ /(\d+) kB/ && $1 * 1024); } dmidecode_category('Memory Device'); - my $s1 = join(' ', grep {$_} @l1); - my $s2 = join(' ', grep {$_} @l2); - warn "$s1 <|> $s2\n" if $s1 && $s2 && $s1 ne $s2; - max(sum(@l1), sum(@l2)) + max(sum(@l1), sum(@l2)); } sub computer_info() { |