diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2000-09-26 16:15:03 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2000-09-26 16:15:03 +0000 |
| commit | b3f38ef54228345b51813641a044a8bf615b3b95 (patch) | |
| tree | b29e83e84b22ffeba0b6512a416f18bab40e7a50 /perl-install/modules.pm | |
| parent | 5088bd44d2469cbcd9e58ee8f6cae74bc9e43cfd (diff) | |
| download | drakx-backup-do-not-use-b3f38ef54228345b51813641a044a8bf615b3b95.tar drakx-backup-do-not-use-b3f38ef54228345b51813641a044a8bf615b3b95.tar.gz drakx-backup-do-not-use-b3f38ef54228345b51813641a044a8bf615b3b95.tar.bz2 drakx-backup-do-not-use-b3f38ef54228345b51813641a044a8bf615b3b95.tar.xz drakx-backup-do-not-use-b3f38ef54228345b51813641a044a8bf615b3b95.zip | |
no_comment
Diffstat (limited to 'perl-install/modules.pm')
| -rw-r--r-- | perl-install/modules.pm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/perl-install/modules.pm b/perl-install/modules.pm index a8b5c3939..f13c86ec2 100644 --- a/perl-install/modules.pm +++ b/perl-install/modules.pm @@ -558,14 +558,15 @@ sub write_conf { print F "$type $mod $v2\n" if $v2 && $type ne "loaded" && !$written->{$mod}{$type}; } } - my @l = map { "scsi_hostadapter$_\n" } '', 1..$scsi-1 if $scsi; + my @l = map { "scsi_hostadapter$_" } '', 1..$scsi-1 if $scsi; push @l, 'ide-floppy' if detect_devices::ide_zips(); push @l, 'bttv' if grep { $_->{driver} eq 'bttv' } detect_devices::probeall(); + my $l = join '|', @l; log::l("to put in modules @l"); substInFile { - $_ = '' if /^scsi_hostadapter/; - $_ = join '', @l if eof; + $_ = '' if /$l/; + $_ = join '', map { "$_\n" } @l if eof; } "$prefix/etc/modules"; } |