summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2015-05-07 07:07:10 -0400
committerThierry Vignaud <thierry.vignaud@gmail.com>2015-05-07 17:27:49 +0200
commit1663047db15a3cb0f9a45c7841eeff00536ff811 (patch)
treee6cb956264b96727502005fd1e402ba7f18c0254
parent3a03c2e77f3e3169b6abb197e95647852b5791ed (diff)
downloaddrakx-1663047db15a3cb0f9a45c7841eeff00536ff811.tar
drakx-1663047db15a3cb0f9a45c7841eeff00536ff811.tar.gz
drakx-1663047db15a3cb0f9a45c7841eeff00536ff811.tar.bz2
drakx-1663047db15a3cb0f9a45c7841eeff00536ff811.tar.xz
drakx-1663047db15a3cb0f9a45c7841eeff00536ff811.zip
fix detecting some memory chips (mga#5810)
side effect: one more string to translate
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/harddrake/data.pm2
-rwxr-xr-xperl-install/standalone/harddrake24
3 files changed, 6 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 146f66e5c..6b166af95 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,5 +1,6 @@
- harddrake:
o fix detecting AHCI as SATA (mga#9992)
+ o fix detecting some memory chips (mga#5810)
o fix not listing uvccideo managed devices as wecams (mga#9992)
Version 16.90 - 28 April 2015
diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm
index 181e47d4c..50496da7f 100644
--- a/perl-install/harddrake/data.pm
+++ b/perl-install/harddrake/data.pm
@@ -433,7 +433,7 @@ our @tree =
string => N("Memory"),
icon => "hw-memory.png",
configurator => "",
- detector => sub { grep { member($_->{name}, 'Cache', 'Memory Module') } detect_devices::dmidecode() },
+ detector => sub { grep { member($_->{name}, 'Cache', 'Memory Module') || $_->{name} eq 'Memory Device' && $_->{Size} ne 'No Module Installed' } detect_devices::dmidecode() },
checked_on_boot => 0,
},
diff --git a/perl-install/standalone/harddrake2 b/perl-install/standalone/harddrake2
index 95353fd03..fc42d285c 100755
--- a/perl-install/standalone/harddrake2
+++ b/perl-install/standalone/harddrake2
@@ -114,6 +114,10 @@ channel number, a target id and a logical unit number") ],
'Current Speed' => [ N("Speed"), N("Speed of the memory bank") ],
'Bank Connections' => [ N("Bank connections"), '' ],
'Socket Designation' => [ N("Name"), N("Socket designation of the memory bank") ],
+ # for Memory Device:
+ 'Locator' => [ N("Location"), ],
+ 'Size' => [ N("Size"), N("Size of the memory device") ],
+ 'Speed' => [ N("Speed"), N("Speed of the memory bank") ],
},
MOUSE =>
{