diff options
| author | Nicolas Planel <nplanel@mandriva.com> | 2003-10-29 16:07:11 +0000 |
|---|---|---|
| committer | Nicolas Planel <nplanel@mandriva.com> | 2003-10-29 16:07:11 +0000 |
| commit | de47eb59bb829423b1d0f47ba13099073999b3cb (patch) | |
| tree | 827f35c4666e15ec66edae7c1fa05d963324602b /perl-install | |
| parent | 1fece42e9c460ca017fc4facad380f05163d8977 (diff) | |
| download | drakx-topic/Corpo_2_1.tar drakx-topic/Corpo_2_1.tar.gz drakx-topic/Corpo_2_1.tar.bz2 drakx-topic/Corpo_2_1.tar.xz drakx-topic/Corpo_2_1.zip | |
Corporate Server 2.1.1 releasetopic/Corpo_2_1
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/modules.pm | 4 | ||||
| -rw-r--r-- | perl-install/share/logo-mandrake.png | bin | 10985 -> 13292 bytes |
2 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}); } diff --git a/perl-install/share/logo-mandrake.png b/perl-install/share/logo-mandrake.png Binary files differindex 59177058a..28439999c 100644 --- a/perl-install/share/logo-mandrake.png +++ b/perl-install/share/logo-mandrake.png |
