summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorOlivier Blin <oblin@mandriva.com>2007-09-13 19:32:33 +0000
committerOlivier Blin <oblin@mandriva.com>2007-09-13 19:32:33 +0000
commitf4ba8846f9b04b9de83a91062c30d39b9f5b7e78 (patch)
tree07ced823eceb2ce3e9791d17ea828974cfe6354e /perl-install
parentaf31299da1b56cc95c048b0d65455599988a95f0 (diff)
downloaddrakx-f4ba8846f9b04b9de83a91062c30d39b9f5b7e78.tar
drakx-f4ba8846f9b04b9de83a91062c30d39b9f5b7e78.tar.gz
drakx-f4ba8846f9b04b9de83a91062c30d39b9f5b7e78.tar.bz2
drakx-f4ba8846f9b04b9de83a91062c30d39b9f5b7e78.tar.xz
drakx-f4ba8846f9b04b9de83a91062c30d39b9f5b7e78.zip
fix loading of tifm_sd module (#18237)
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/modules.pm4
2 files changed, 4 insertions, 2 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index e3b025fa5..5a3572b3a 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,5 @@
+- fix loading of tifm_sd module (#18237)
+
Version 10.4.193 - 13 September 2007, by Thierry Vignaud
- drakbug:
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index ab4ad22ef..141b509e5 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -285,8 +285,8 @@ sub when_load_category {
$sound_alias ||= 'sound-slot-0';
$conf->set_sound_slot($sound_alias, $name);
} elsif ($category =~ m!disk/card_reader!) {
- $conf->set_above($name, 'tifm_sd') if $name =~ /tifm_7xx1/;
- $conf->set_above($name, 'mmc_block');
+ my @modules = ('mmc_block', if_($name =~ /tifm_7xx1/, 'tifm_sd'));
+ $conf->set_above($name, join(' ', @modules));
}
}