diff options
| author | damien <damien@mandriva.com> | 2000-12-12 14:04:16 +0000 |
|---|---|---|
| committer | damien <damien@mandriva.com> | 2000-12-12 14:04:16 +0000 |
| commit | c49b69446a45419f9a2f008ede0f228bf6ce760e (patch) | |
| tree | 38f313cebdcb9ee4da44ce62d11211ede6fc9bd3 | |
| parent | 29c61efadcb77c783d3d6f12ea2843baac34416a (diff) | |
| download | drakx-c49b69446a45419f9a2f008ede0f228bf6ce760e.tar drakx-c49b69446a45419f9a2f008ede0f228bf6ce760e.tar.gz drakx-c49b69446a45419f9a2f008ede0f228bf6ce760e.tar.bz2 drakx-c49b69446a45419f9a2f008ede0f228bf6ce760e.tar.xz drakx-c49b69446a45419f9a2f008ede0f228bf6ce760e.zip | |
my fault, corrected renaud's patch incorporation
| -rw-r--r-- | perl-install/modules.pm | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/perl-install/modules.pm b/perl-install/modules.pm index 4494e366c..0714ba3e3 100644 --- a/perl-install/modules.pm +++ b/perl-install/modules.pm @@ -544,8 +544,11 @@ sub read_conf($;$) { sub mergein_conf { my ($file) = @_; +#- add2hash(\%conf, read_conf($file, \$scsi)); my $modconfref = read_conf ($file, \$scsi); - map { my ($key, $value) = $_; $conf{$key}{alias} ||= $value->{alias} } %$modconfref; + while (my ($key, $value) = each %$modconfref) { + $conf{$key}{alias} = $value->{alias} unless exists $conf{$key}{alias}; + } } sub write_conf { @@ -555,7 +558,7 @@ sub write_conf { rename "$prefix/etc/conf.modules", $file; #- make the switch to new name if needed #- remove the post-install supermount stuff. We now do it in /etc/modules - # Substitute new aliases in modules.conf (if config has changed) + #- Substitute new aliases in modules.conf (if config has changed) substInFile { $_ = '' if /^post-install supermount/; my ($type,$alias,$module) = split /\s+/, $_; |