diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2004-01-29 16:03:07 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2004-01-29 16:03:07 +0000 |
| commit | 9268a572b5d3a25dd3a34b4ed46d9ba318123fa3 (patch) | |
| tree | 7052f4f8aed193af55a24ec25b52d4b408983fb1 | |
| parent | 71f1a980cbc3028a917346cd9d6b120bda66cc75 (diff) | |
| download | drakx-backup-do-not-use-9268a572b5d3a25dd3a34b4ed46d9ba318123fa3.tar drakx-backup-do-not-use-9268a572b5d3a25dd3a34b4ed46d9ba318123fa3.tar.gz drakx-backup-do-not-use-9268a572b5d3a25dd3a34b4ed46d9ba318123fa3.tar.bz2 drakx-backup-do-not-use-9268a572b5d3a25dd3a34b4ed46d9ba318123fa3.tar.xz drakx-backup-do-not-use-9268a572b5d3a25dd3a34b4ed46d9ba318123fa3.zip | |
fix interface config file writing
| -rw-r--r-- | perl-install/network/netconnect.pm | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm index 1980f0aad..b15b3e3ff 100644 --- a/perl-install/network/netconnect.pm +++ b/perl-install/network/netconnect.pm @@ -688,10 +688,8 @@ If you don't know, choose 'use pppoe'"), # process static/dhcp ethernet devices: if (!exists $adsl_devices{$ntf_name} && member($adsl_type, qw(manual dhcp))) { $auto_ip = $adsl_type eq 'dchp'; - $ethntf->{DEVICE} = $ntf_name; $find_lan_module->(); - delete $ethntf->{$_} foreach keys %$ethntf; - add2hash($ethntf, $intf->{$ntf_name}); + $ethntf = $intf->{$ntf_name}; return 'lan_intf'; } network::adsl::adsl_probe_info($netcnx, $netc, $adsl_type, $ntf_name); @@ -758,8 +756,7 @@ You can find a driver on http://eciadsl.flashtux.org/"), allow_empty_list => 1, format => sub { $eth_intf{$_[0]} } } ]; }, post => sub { - delete $ethntf->{$_} foreach keys %$ethntf; - add2hash($ethntf, $intf->{$ntf_name}); + $ethntf = $intf->{$ntf_name}; $::isInstall && $netc->{NET_DEVICE} eq $ethntf->{DEVICE} ? 'lan_alrd_cfg' : 'lan_protocol'; }, }, |