summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordamien <damien@mandriva.com>2002-03-16 11:56:54 +0000
committerdamien <damien@mandriva.com>2002-03-16 11:56:54 +0000
commitb4fa1b4ba123a6a8f2895a7317c54173bbf5782a (patch)
tree56f34d53b351dff30ec10b109bf8a2afd1ae6874
parent2f945a508c3dab874c42e4455bdd0f1de161e3f5 (diff)
downloaddrakx-b4fa1b4ba123a6a8f2895a7317c54173bbf5782a.tar
drakx-b4fa1b4ba123a6a8f2895a7317c54173bbf5782a.tar.gz
drakx-b4fa1b4ba123a6a8f2895a7317c54173bbf5782a.tar.bz2
drakx-b4fa1b4ba123a6a8f2895a7317c54173bbf5782a.tar.xz
drakx-b4fa1b4ba123a6a8f2895a7317c54173bbf5782a.zip
we now consider dhcp provide GATEWAY and internet connection.
-rw-r--r--perl-install/network/ethernet.pm4
1 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/network/ethernet.pm b/perl-install/network/ethernet.pm
index 0591df8d8..fc8a0c975 100644
--- a/perl-install/network/ethernet.pm
+++ b/perl-install/network/ethernet.pm
@@ -61,8 +61,10 @@ sub configure_lan {
$::isInstall and $in->set_help('configureNetworkIP');
configureNetwork($netc, $intf, $first_time) or return;
configureNetwork2($in, $prefix, $netc, $intf);
+ my $hasdhcp = 0;
+ foreach (keys(%$intf)) { $intf->{$_}{BOOTPROTO} eq "dhcp" and $hasdhcp = 1}
$netc->{NETWORKING} = "yes";
- if ($netc->{GATEWAY}) {
+ if ($netc->{GATEWAY} || $hasdhcp) {
$netcnx->{type}='lan';
$netcnx->{NET_DEVICE} = $netc->{NET_DEVICE} = '';
$netcnx->{NET_INTERFACE} = 'lan'; #$netc->{NET_INTERFACE};