diff options
author | Mystery Man <unknown@mandriva.org> | 2003-10-29 16:07:11 +0000 |
---|---|---|
committer | Mystery Man <unknown@mandriva.org> | 2003-10-29 16:07:11 +0000 |
commit | fa40f30b4253b1e05c46cc5e0c111176825b7623 (patch) | |
tree | 76cf2d26c0ce0ee7c6a2c1a1a2b65bc4d8e33029 /perl-install/modules.pm | |
parent | 327bd24f8e4291bd1882de1990dd7339f781a9cb (diff) | |
download | drakx-backup-do-not-use-Corpo_2_1_1.tar drakx-backup-do-not-use-Corpo_2_1_1.tar.gz drakx-backup-do-not-use-Corpo_2_1_1.tar.bz2 drakx-backup-do-not-use-Corpo_2_1_1.tar.xz drakx-backup-do-not-use-Corpo_2_1_1.zip |
This commit was manufactured by cvs2svn to create tag 'Corpo_2_1_1'.Corpo_2_1_1
Diffstat (limited to 'perl-install/modules.pm')
-rw-r--r-- | perl-install/modules.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/perl-install/modules.pm b/perl-install/modules.pm index c3ed4cb89..98bd6fd7e 100644 --- a/perl-install/modules.pm +++ b/perl-install/modules.pm @@ -36,7 +36,7 @@ sub load { @l = difference2([ uniq(@l) ], [ loaded_modules() ]) or return; my $network_module = do { - my ($network_modules, $other) = partition { module2category($_) =~ m,network/(main|usb), } @l; + my ($network_modules, $other) = partition { module2category($_) =~ m,network/(main|usb|gigabit), } @l; if (@$network_modules > 1) { # do it one by one load($_) foreach @$network_modules; @@ -217,7 +217,7 @@ sub mergein_conf { my ($file) = @_; my $modconfref = read_conf($file); while (my ($key, $value) = each %$modconfref) { - $conf{$key}{alias} = $value->{alias} if !exists $conf{$key}{alias}; + $conf{$key}{alias} = $value->{alias} if ! $conf{$key}{alias}; $conf{$key}{options} = $value->{options} if $value->{options}; push @{$conf{$key}{probeall} ||= []}, deref($value->{probeall}); } |