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/standalone/drakgw | |
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/standalone/drakgw')
-rwxr-xr-x | perl-install/standalone/drakgw | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/perl-install/standalone/drakgw b/perl-install/standalone/drakgw index cd0fdc7e3..3e7997208 100755 --- a/perl-install/standalone/drakgw +++ b/perl-install/standalone/drakgw @@ -210,8 +210,9 @@ my %aliased_devices; my $card_netconnect = network::netconnect::get_net_device() || "eth0"; defined $card_netconnect and log::l("[drakgw] Information from netconnect: ignore card $card_netconnect"); -my @all_cards = network::ethernet::get_eth_cards(); -my %net_devices = network::ethernet::get_eth_cards_names(@all_cards); +my $modules_conf = modules::any_conf->read; +my @all_cards = network::ethernet::get_eth_cards($modules_conf); +my %net_devices = network::ethernet::get_eth_cards_names($modules_conf, @all_cards); put_in_hash(\%net_devices, { 'ppp+' => 'ppp+', 'ippp+' => 'ippp+' }); $in->ask_from('', |