summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/modules.pm4
-rw-r--r--perl-install/share/logo-mandrake.pngbin10985 -> 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
index 59177058a..28439999c 100644
--- a/perl-install/share/logo-mandrake.png
+++ b/perl-install/share/logo-mandrake.png
Binary files differ