diff options
| author | Pascal Terjan <pterjan@mandriva.org> | 2009-05-27 12:58:04 +0000 |
|---|---|---|
| committer | Pascal Terjan <pterjan@mandriva.org> | 2009-05-27 12:58:04 +0000 |
| commit | 70605f61c8e145857853a1d8afdf034cd4f2fc18 (patch) | |
| tree | 71878892ad167176063e3d5a828287a309405a9b | |
| parent | f2a2778a73cf7f46b9a2a53257bbae99f0771106 (diff) | |
| download | drakx-70605f61c8e145857853a1d8afdf034cd4f2fc18.tar drakx-70605f61c8e145857853a1d8afdf034cd4f2fc18.tar.gz drakx-70605f61c8e145857853a1d8afdf034cd4f2fc18.tar.bz2 drakx-70605f61c8e145857853a1d8afdf034cd4f2fc18.tar.xz drakx-70605f61c8e145857853a1d8afdf034cd4f2fc18.zip | |
do not ignore FB-DIMM memory
| -rw-r--r-- | perl-install/NEWS | 3 | ||||
| -rw-r--r-- | perl-install/detect_devices.pm | 2 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 51a43a9a6..e65c0604f 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -4,10 +4,11 @@ - add support for ElanTech touchpads (found on EEEPCs) - harddrake: o adding sierra module to network/cellular. -- harddrake o fix detecting scanners - scannerdrake: o do not reject scanners handled by 'usbcore' driver +- detect_devices: + o don't ignore FB-DIMM memory Version 12.32 - 23 April 2009 diff --git a/perl-install/detect_devices.pm b/perl-install/detect_devices.pm index 741a0dfd6..02dd6ef4f 100644 --- a/perl-install/detect_devices.pm +++ b/perl-install/detect_devices.pm @@ -1043,7 +1043,7 @@ sub dmidecode_category { #- size in MB 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)$/ && + my @l2 = map { $_->{'Form Factor'} =~ /^(SIMM|SIP|DIP|DIMM|FB-DIMM|RIMM|SODIMM|SRIMM)$/ && ($_->{Size} =~ /(\d+) MB/ && $1 || $_->{Size} =~ /(\d+) kB/ && $1 * 1024); } dmidecode_category('Memory Device'); max(sum(@l1), sum(@l2)); diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 099c33a0a..b59cc8ee3 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +- don't ignore FB-DIMM memory + Version 12.35 - 24 April 2009 - remove unused parameter in installPackages |