diff options
| author | Olivier Blin <oblin@mandriva.org> | 2004-10-01 12:29:20 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.org> | 2004-10-01 12:29:20 +0000 |
| commit | 501dbc162c88a19d3603eadbeb31eaa8d39a6988 (patch) | |
| tree | 5972436339b43323526f7dd968adeea90ae26ea8 | |
| parent | 3a7ec4ae6da36f5c0b3a0ed27c75bd280c68202c (diff) | |
| download | drakx-backup-do-not-use-501dbc162c88a19d3603eadbeb31eaa8d39a6988.tar drakx-backup-do-not-use-501dbc162c88a19d3603eadbeb31eaa8d39a6988.tar.gz drakx-backup-do-not-use-501dbc162c88a19d3603eadbeb31eaa8d39a6988.tar.bz2 drakx-backup-do-not-use-501dbc162c88a19d3603eadbeb31eaa8d39a6988.tar.xz drakx-backup-do-not-use-501dbc162c88a19d3603eadbeb31eaa8d39a6988.zip | |
create $intf->{sagem} when needed before checking it exists ...
(make sagem usable again with dhcp/static connections)
| -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 9f39506d6..cb46efbd4 100644 --- a/perl-install/network/netconnect.pm +++ b/perl-install/network/netconnect.pm @@ -807,14 +807,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" && member($adsl_type, qw(manual dhcp))) { + #- "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 + } # 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'; |