diff options
| -rw-r--r-- | perl-install/install_steps_auto_install.pm | 2 | ||||
| -rw-r--r-- | perl-install/modules.pm | 2 | ||||
| -rw-r--r-- | perl-install/network/ethernet.pm | 6 | ||||
| -rw-r--r-- | perl-install/network/netconnect.pm | 4 | ||||
| -rw-r--r-- | perl-install/network/network.pm | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/perl-install/install_steps_auto_install.pm b/perl-install/install_steps_auto_install.pm index 92d3f1722..79277b846 100644 --- a/perl-install/install_steps_auto_install.pm +++ b/perl-install/install_steps_auto_install.pm @@ -40,7 +40,7 @@ sub new { sub configureNetwork { my ($_o) = @_; log::l("install_steps_auto_install::configureNetwork"); - modules::load_category('network/main|usb'); + modules::load_category('network/main|gigabit|usb'); goto &install_steps::configureNetwork; } diff --git a/perl-install/modules.pm b/perl-install/modules.pm index 8a28ef23b..ad8519635 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|gigabit|usb), } @l; if (@$network_modules > 1) { # do it one by one load($_) foreach @$network_modules; diff --git a/perl-install/network/ethernet.pm b/perl-install/network/ethernet.pm index db95c1a17..9127a03c7 100644 --- a/perl-install/network/ethernet.pm +++ b/perl-install/network/ethernet.pm @@ -77,7 +77,7 @@ qq( sub conf_network_card { my ($netc, $intf, $type, $ipadr, $netadr) = @_; #-type =static or dhcp - modules::interactive::load_category($in, 'network/main|usb', !$::expert, 1); + modules::interactive::load_category($in, 'network/main|gigabit|usb', !$::expert, 1); my @all_cards = conf_network_card_backend($netc, $intf, $type, undef, $ipadr, $netadr); my $interface; @all_cards == () and $in->ask_warn('', N("No ethernet network adapter has been detected on your system. @@ -99,7 +99,7 @@ I cannot set up this connection type.")) and return; 1; } -#- conf_network_card_backend : configure the network cards and return the list of them, or configure one specified interface : WARNING, you have to setup the ethernet cards, by calling load_category($in, 'network/main|usb', !$::expert, 1) or load_category_backend before calling this function. Basically, you call this function in 2 times. +#- conf_network_card_backend : configure the network cards and return the list of them, or configure one specified interface : WARNING, you have to setup the ethernet cards, by calling load_category($in, 'network/main|gigabit|usb', !$::expert, 1) or load_category_backend before calling this function. Basically, you call this function in 2 times. #- input #- $prefix #- $netc @@ -166,7 +166,7 @@ sub go_ethernet { sub configureNetwork { my ($netc, $intf, $_first_time) = @_; local $_; - modules::interactive::load_category($in, 'network/main|usb|pcmcia', !$::expert, 1) or return; + modules::interactive::load_category($in, 'network/main|gigabit|usb|pcmcia', !$::expert, 1) or return; my @l = detect_devices::getNet() or die N("no network card found"); my @all_cards = conf_network_card_backend($netc, $intf, undef, undef, undef, undef); diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm index ff9c73c71..a2bc40aba 100644 --- a/perl-install/network/netconnect.pm +++ b/perl-install/network/netconnect.pm @@ -59,7 +59,7 @@ sub detect { $auto_detect->{isdn}{$_} = $isdn->{$_} foreach qw(description vendor id driver card_type type); $auto_detect->{isdn}{description} =~ s/.*\|//; - modules::load_category('network/main|usb'); + modules::load_category('network/main|gigabit|usb'); require network::ethernet; network::ethernet->import; my @all_cards = conf_network_card_backend(undef, undef, undef, undef, undef, undef); @@ -325,7 +325,7 @@ sub save_conf { $netcnx->{type} =~ /adsl/ and $adsl = $netcnx->{$netcnx->{type}}; $netcnx->{type} eq 'isdn_external' || $netcnx->{type} eq 'modem' and $modem = $netcnx->{$netcnx->{type}}; $netcnx->{type} eq 'isdn_internal' and $isdn = $netcnx->{$netcnx->{type}}; - modules::load_category('network/main|usb'); + modules::load_category('network/main|gigabit|usb'); require network::ethernet; network::ethernet->import; my @_all_cards = conf_network_card_backend($netc, $intf, undef, undef, undef, undef); diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm index a48562214..cd8234fb9 100644 --- a/perl-install/network/network.pm +++ b/perl-install/network/network.pm @@ -437,7 +437,7 @@ sub easy_dhcp { require modules; require network::ethernet; - modules::load_category('network/main|usb'); + modules::load_category('network/main|gigabit|usb'); my @all_cards = network::ethernet::conf_network_card_backend(); #- only for a single network card |