diff options
| -rw-r--r-- | kernel/list_modules.pm | 4 | ||||
| -rw-r--r-- | perl-install/harddrake/data.pm | 2 | ||||
| -rw-r--r-- | perl-install/install_steps_interactive.pm | 2 | ||||
| -rw-r--r-- | perl-install/network/ethernet.pm | 8 | ||||
| -rw-r--r-- | perl-install/network/netconnect.pm | 6 | ||||
| -rw-r--r-- | perl-install/network/network.pm | 2 |
6 files changed, 10 insertions, 14 deletions
diff --git a/kernel/list_modules.pm b/kernel/list_modules.pm index 8c868ec93..e233e7690 100644 --- a/kernel/list_modules.pm +++ b/kernel/list_modules.pm @@ -251,6 +251,10 @@ sub module2category { return; } +sub ethernet_categories() { + 'network/main|gigabit|pcmcia|usb|wireless|firewire'; +} + sub sub_categories { my ($t1) = @_; keys %{$l{$t1}}; diff --git a/perl-install/harddrake/data.pm b/perl-install/harddrake/data.pm index a17b77535..80defff84 100644 --- a/perl-install/harddrake/data.pm +++ b/perl-install/harddrake/data.pm @@ -204,7 +204,7 @@ our @tree = detector => sub { require list_modules; require network::ethernet; - my @net_modules = list_modules::category2modules(network::ethernet::get_eth_categories()); + my @net_modules = list_modules::category2modules(list_modules::ethernet_categories()); f(grep { $_->{media_type} && $_->{media_type} =~ /^NETWORK/ || $_->{type} && $_->{type} eq 'network' diff --git a/perl-install/install_steps_interactive.pm b/perl-install/install_steps_interactive.pm index e128ea553..5bd9825e9 100644 --- a/perl-install/install_steps_interactive.pm +++ b/perl-install/install_steps_interactive.pm @@ -778,7 +778,7 @@ sub updateModulesFromFloppy { sub configureNetwork { my ($o) = @_; require network::ethernet; - modules::load_category($o->{modules_conf}, network::ethernet::get_eth_categories()); + modules::load_category($o->{modules_conf}, list_modules::ethernet_categories()); if ($o->{meta_class} eq 'firewall') { require network::netconnect; diff --git a/perl-install/network/ethernet.pm b/perl-install/network/ethernet.pm index ec037fff2..66562b5ed 100644 --- a/perl-install/network/ethernet.pm +++ b/perl-install/network/ethernet.pm @@ -8,10 +8,6 @@ use detect_devices; use common; use run_program; use network::tools; -use vars qw(@ISA @EXPORT); - -@ISA = qw(Exporter); -@EXPORT = qw(get_eth_categories); sub write_ether_conf { my ($in, $modules_conf, $netcnx, $netc, $intf) = @_; @@ -37,10 +33,6 @@ sub mapIntfToDevice { } -sub get_eth_categories() { - 'network/main|gigabit|pcmcia|usb|wireless|firewire'; -} - # return list of [ intf_name, module, device_description ] tuples such as: # [ "eth0", "3c59x", "3Com Corporation|3c905C-TX [Fast Etherlink]" ] # diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm index c593d5045..56c08541f 100644 --- a/perl-install/network/netconnect.pm +++ b/perl-install/network/netconnect.pm @@ -22,7 +22,7 @@ sub detect { }, lan => sub { # ethernet require network::ethernet; - modules::load_category($modules_conf, network::ethernet::get_eth_categories()); + modules::load_category($modules_conf, list_modules::ethernet_categories()); $auto_detect->{lan} = { map { $_->[0] => $_->[1] } network::ethernet::get_eth_cards($modules_conf) }; }, adsl => sub { @@ -126,7 +126,7 @@ sub real_main { my $lan_detect = sub { detect($modules_conf, $netc->{autodetect}, 'lan'); require network::ethernet; - modules::interactive::load_category($in, $modules_conf, network::ethernet::get_eth_categories(), !$::expert, 0); + modules::interactive::load_category($in, $modules_conf, list_modules::ethernet_categories(), !$::expert, 0); @all_cards = network::ethernet::get_eth_cards($modules_conf); %all_eth_intf = network::ethernet::get_eth_cards_names(@all_cards); #- needed not to loose GATEWAYDEV require list_modules; #- FIXME: check if useful @@ -889,7 +889,7 @@ You can find a driver on http://eciadsl.flashtux.org/"), post => sub { if ($ntf_name eq "Manually load a driver") { require network::ethernet; - modules::interactive::load_category__prompt($in, $modules_conf, network::ethernet::get_eth_categories()); + modules::interactive::load_category__prompt($in, $modules_conf, list_modules::ethernet_categories()); return 'lan'; } $ethntf = $intf->{$ntf_name} ||= { DEVICE => $ntf_name }; diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm index ed5fa646d..cad6eb7d5 100644 --- a/perl-install/network/network.pm +++ b/perl-install/network/network.pm @@ -379,7 +379,7 @@ sub easy_dhcp { require modules; require network::ethernet; - modules::load_category($modules_conf, network::ethernet::get_eth_categories()); + modules::load_category($modules_conf, list_modules::ethernet_categories()); my @all_dev = sort map { $_->[0] } network::ethernet::get_eth_cards($modules_conf); #- only for a single ethernet network card |