diff options
author | Pascal Rigaux <pixel@mandriva.com> | 2004-07-21 00:16:04 +0000 |
---|---|---|
committer | Pascal Rigaux <pixel@mandriva.com> | 2004-07-21 00:16:04 +0000 |
commit | 7e8fa9773839843c9d8def81ec2ef1315115825a (patch) | |
tree | b20f63ae9f67b2d9c7e8aa6a2b86d56e0d953743 /perl-install/network/network.pm | |
parent | 54b71cdf438434e4693aa6064596f4fdb4aac59e (diff) | |
download | drakx-7e8fa9773839843c9d8def81ec2ef1315115825a.tar drakx-7e8fa9773839843c9d8def81ec2ef1315115825a.tar.gz drakx-7e8fa9773839843c9d8def81ec2ef1315115825a.tar.bz2 drakx-7e8fa9773839843c9d8def81ec2ef1315115825a.tar.xz drakx-7e8fa9773839843c9d8def81ec2ef1315115825a.zip |
- %modules::conf is no more a global, so many functions need passing $modules_conf
- $modules_conf is a class choosing modules.conf or modprobe.conf
(esp. useful after install) (but not working yet!)
- modules::load() doesn't use $modules_conf, use modules::load_and_configure()
- modules::load() doesn't allow options, use either modules::load_raw() or modules::load_and_configure()
- some functions used to want an array ref for modules options and some a string, now every functions use a string
- many functions (like modules::get_alias()) are now methods on $modules_conf
- some functions in mouse.pm needed a $in where a $do_pkgs is enough
- some perl_checker compliance
- small fixes
Diffstat (limited to 'perl-install/network/network.pm')
-rw-r--r-- | perl-install/network/network.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm index 9f4256770..ae871084e 100644 --- a/perl-install/network/network.pm +++ b/perl-install/network/network.pm @@ -363,14 +363,14 @@ sub probe_netcnx_type { } sub easy_dhcp { - my ($netc, $intf) = @_; + my ($modules_conf, $netc, $intf) = @_; return if text2bool($netc->{NETWORKING}); require modules; require network::ethernet; - modules::load_category('network/main|gigabit|usb'); - my @all_cards = network::ethernet::get_eth_cards(); + modules::load_category($modules_conf, 'network/main|gigabit|usb'); + my @all_cards = network::ethernet::get_eth_cards($modules_conf); #- only for a single network card (any { $_->[0] eq 'eth0' } @all_cards) && (every { $_->[0] ne 'eth1' } @all_cards) or return; |