diff options
| author | Olivier Blin <oblin@mandriva.org> | 2004-09-13 13:19:16 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.org> | 2004-09-13 13:19:16 +0000 |
| commit | b64b3daa14303f75a6d4c606dd155e55002e8f14 (patch) | |
| tree | 30a2a72a82265f0f78a1f53340bbbdb04de4e3a9 | |
| parent | c54e6bf2cda3d36af3e5a0de99e07c7455b52c45 (diff) | |
| download | drakx-b64b3daa14303f75a6d4c606dd155e55002e8f14.tar drakx-b64b3daa14303f75a6d4c606dd155e55002e8f14.tar.gz drakx-b64b3daa14303f75a6d4c606dd155e55002e8f14.tar.bz2 drakx-b64b3daa14303f75a6d4c606dd155e55002e8f14.tar.xz drakx-b64b3daa14303f75a6d4c606dd155e55002e8f14.zip | |
only write ifcfg-sagem when needed
| -rw-r--r-- | perl-install/network/netconnect.pm | 12 |
1 files changed, 6 insertions, 6 deletions
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'; |