summaryrefslogtreecommitdiffstats
path: root/perl-install/modules.pm
diff options
context:
space:
mode:
authorPascal Rigaux <pixel@mandriva.com>2000-02-29 23:50:14 +0000
committerPascal Rigaux <pixel@mandriva.com>2000-02-29 23:50:14 +0000
commit4d37bebbb47db98088c70d4d4395ca29cef35f8a (patch)
tree996d38b7735fa03a79be75615dbe6692916d0094 /perl-install/modules.pm
parent6de7bc2092b2c1c7c3bae2b4a7d0c8b59ce5e1d3 (diff)
downloaddrakx-4d37bebbb47db98088c70d4d4395ca29cef35f8a.tar
drakx-4d37bebbb47db98088c70d4d4395ca29cef35f8a.tar.gz
drakx-4d37bebbb47db98088c70d4d4395ca29cef35f8a.tar.bz2
drakx-4d37bebbb47db98088c70d4d4395ca29cef35f8a.tar.xz
drakx-4d37bebbb47db98088c70d4d4395ca29cef35f8a.zip
no_comment
Diffstat (limited to 'perl-install/modules.pm')
-rw-r--r--perl-install/modules.pm16
1 files changed, 7 insertions, 9 deletions
diff --git a/perl-install/modules.pm b/perl-install/modules.pm
index 734523fcb..d66b3172b 100644
--- a/perl-install/modules.pm
+++ b/perl-install/modules.pm
@@ -1,6 +1,6 @@
package modules;
-use vars qw(%loaded %drivers $scsi);
+use vars qw(%loaded %drivers);
use common qw(:common :file :system);
use detect_devices;
@@ -10,7 +10,7 @@ use log;
my %conf;
my %loaded; #- array of loaded modules for each types (scsi/net/...)
-$scsi = 0;
+my $scsi = 0;
my %deps = ();
my @drivers_by_category = (
@@ -86,9 +86,9 @@ arch() =~ /^sparc/ ? (
"3c59x" => "3com 3c59x (Vortex)",
"de4x5" => "Digital 425,434,435,450,500",
"rtl8139" => "RealTek RTL8129/8139",
-
+}],
+[ 'network', {
"8390" => "8390",
- "dummy" => "dummy",
"af_packet" => "packet socket",
"nfs" => "Network File System (nfs)",
"lockd" => "lockd",
@@ -340,11 +340,11 @@ sub text2driver($) {
sub add_alias($$) {
my ($alias, $name) = @_;
- /\Q$alias/ && $conf{$_}{alias} && $conf{$_}{alias} eq $name and return foreach keys %conf;
+ /\Q$alias/ && $conf{$_}{alias} && $conf{$_}{alias} eq $name and return $_ foreach keys %conf;
$alias .= $scsi++ || '' if $alias eq 'scsi_hostadapter';
log::l("adding alias $alias to $name");
$conf{$alias}{alias} ||= $name;
- 1;
+ $alias;
}
sub remove_alias($) {
@@ -464,15 +464,13 @@ sub write_conf {
my ($file) = @_;
#- remove the post-install supermount stuff. We may have to add some more
- substInFile { $_ = '' if /post-install supermount/ } $file;
+ substInFile { $_ = '' if /^post-install supermount/ } $file;
my $written = read_conf($file);
my %net = detect_devices::net2module();
while (my ($k, $v) = each %net) { add_alias($k, $v) }
- add_alias('scsi_hostadapter', 'ide-scsi') if detect_devices::getIDEBurners();
-
if (my @scsis = sort grep { $conf{$_}{alias} && /scsi_hostadapter/ } keys %conf) {
log::l("has scsis ", join " ; ", map { "modprobe $_" } @scsis);
$conf{supermount}{"post-install"} = join " ; ", map { "modprobe $_" } @scsis;