diff options
| author | Olivier Blin <oblin@mandriva.org> | 2004-08-17 12:49:55 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.org> | 2004-08-17 12:49:55 +0000 |
| commit | bc85d2bb9f9f33d3689d8cd31bb7f1110548592e (patch) | |
| tree | 81614033089d1dce44f81676de04694545117f43 | |
| parent | 332d925103bf25a304bc17c84f68dc90e93f5514 (diff) | |
| download | drakx-backup-do-not-use-bc85d2bb9f9f33d3689d8cd31bb7f1110548592e.tar drakx-backup-do-not-use-bc85d2bb9f9f33d3689d8cd31bb7f1110548592e.tar.gz drakx-backup-do-not-use-bc85d2bb9f9f33d3689d8cd31bb7f1110548592e.tar.bz2 drakx-backup-do-not-use-bc85d2bb9f9f33d3689d8cd31bb7f1110548592e.tar.xz drakx-backup-do-not-use-bc85d2bb9f9f33d3689d8cd31bb7f1110548592e.zip | |
(easy_dhcp) don't use network::ethernet::conf_network_card_backend
| -rw-r--r-- | perl-install/network/network.pm | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/perl-install/network/network.pm b/perl-install/network/network.pm index ea16b36dc..eff3ce5cd 100644 --- a/perl-install/network/network.pm +++ b/perl-install/network/network.pm @@ -363,7 +363,6 @@ sub easy_dhcp { return if text2bool($netc->{NETWORKING}); require modules; - require network::ethernet; modules::load_category($modules_conf, 'network/main|gigabit|pcmcia|usb'); my @all_dev = sort map { $_->[0] } network::ethernet::get_eth_cards($modules_conf); @@ -374,12 +373,19 @@ sub easy_dhcp { my $dhcp_intf = $ether_dev[0]; log::explanations("easy_dhcp: found $dhcp_intf"); - network::ethernet::conf_network_card_backend($netc, $intf, 'dhcp', $dhcp_intf); - - put_in_hash($netc, { + put_in_hash($netc, { NETWORKING => "yes", DHCP => "yes", + NET_DEVICE => $dhcp_intf, + NET_INTERFACE => $dhcp_intf, }); + $intf->{$dhcp_intf} ||= {}; + put_in_hash($intf->{$dhcp_intf}, { + DEVICE => $dhcp_intf, + BOOTPROTO => 'dhcp', + NETMASK => '255.255.255.0', + ONBOOT => 'yes' + }); 1; } |