summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2005-02-14 14:18:59 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2005-02-14 14:18:59 +0000
commite1377e07094d7259a740c2189a177cd6336b8ffa (patch)
treefa2976231797a9cc3203376fa243a9d6dd6ae247
parentd491f672f74171724dd45cdb707aa36373b0bb2e (diff)
downloaddrakx-e1377e07094d7259a740c2189a177cd6336b8ffa.tar
drakx-e1377e07094d7259a740c2189a177cd6336b8ffa.tar.gz
drakx-e1377e07094d7259a740c2189a177cd6336b8ffa.tar.bz2
drakx-e1377e07094d7259a740c2189a177cd6336b8ffa.tar.xz
drakx-e1377e07094d7259a740c2189a177cd6336b8ffa.zip
(remove_module) handle removal of cards (#7049)
-rw-r--r--perl-install/modules/any_conf.pm4
1 files changed, 4 insertions, 0 deletions
diff --git a/perl-install/modules/any_conf.pm b/perl-install/modules/any_conf.pm
index c7ce2a475..c6174fd81 100644
--- a/perl-install/modules/any_conf.pm
+++ b/perl-install/modules/any_conf.pm
@@ -104,6 +104,10 @@ sub remove_alias_regexp_byname {
sub remove_module {
my ($conf, $module) = @_;
$module = $conf->mapping($module);
+ substInFile {
+ undef $_ if /^$module/;
+ } $_ foreach "$::prefix/etc/modules", "$::prefix/etc/modprobe.preload";
+
$conf->remove_alias($module);
log::explanations("removing module $module");
delete $conf->{$module};