From b64b3daa14303f75a6d4c606dd155e55002e8f14 Mon Sep 17 00:00:00 2001 From: Olivier Blin Date: Mon, 13 Sep 2004 13:19:16 +0000 Subject: only write ifcfg-sagem when needed --- perl-install/network/netconnect.pm | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'perl-install/network/netconnect.pm') diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm index c364752ab..b0c427469 100644 --- a/perl-install/network/netconnect.pm +++ b/perl-install/network/netconnect.pm @@ -788,14 +788,14 @@ If you don't know, choose 'use PPPoE'"), # blacklist bogus driver, enable ifplugd support else: $find_lan_module->(); $ethntf->{MII_NOT_SUPPORTED} ||= $is_hotplug_blacklisted->(); - if ($ntf_name eq "sagem") { - #- "fctStartAdsl -i" links ifcfg-ethX to ifcfg-sagem and echoes ethX - #- it auto-detects dhcp/static modes thanks to encapsulation setting - $ethntf = $intf->{$ntf_name} = { DEVICE => "`/usr/sbin/fctStartAdsl -i`", MII_NOT_SUPPORTED => "yes" }; - network::adsl::sagem_set_parameters($netc); #- FIXME: should be delayed - } # process static/dhcp ethernet devices: if (exists($intf->{$ntf_name}) && member($adsl_type, qw(manual dhcp))) { + if ($ntf_name eq "sagem") { + #- "fctStartAdsl -i" builds ifcfg-ethX from ifcfg-sagem and echoes ethX + #- it auto-detects dhcp/static modes thanks to encapsulation setting + $ethntf = $intf->{sagem} = { DEVICE => "`/usr/sbin/fctStartAdsl -i`", MII_NOT_SUPPORTED => "yes" }; + network::adsl::sagem_set_parameters($netc); #- FIXME: should be delayed + } $ethntf->{TYPE} = "ADSL"; $auto_ip = $adsl_type eq 'dhcp'; return 'lan_intf'; -- cgit v1.2.1