diff options
| author | Olivier Blin <oblin@mandriva.org> | 2004-10-03 17:46:05 +0000 |
|---|---|---|
| committer | Olivier Blin <oblin@mandriva.org> | 2004-10-03 17:46:05 +0000 |
| commit | 8ca26e20b6c9a46e3afc207a76d444aa7ae21fa7 (patch) | |
| tree | 662643750d2b45326dcd5c868fed289a15373d11 | |
| parent | 9a9b47236d0eb2a99f2868c31095644a32232200 (diff) | |
| download | drakx-backup-do-not-use-8ca26e20b6c9a46e3afc207a76d444aa7ae21fa7.tar drakx-backup-do-not-use-8ca26e20b6c9a46e3afc207a76d444aa7ae21fa7.tar.gz drakx-backup-do-not-use-8ca26e20b6c9a46e3afc207a76d444aa7ae21fa7.tar.bz2 drakx-backup-do-not-use-8ca26e20b6c9a46e3afc207a76d444aa7ae21fa7.tar.xz drakx-backup-do-not-use-8ca26e20b6c9a46e3afc207a76d444aa7ae21fa7.zip | |
remove TYPE field in ifcfg files if connection type isn't ADSL
| -rw-r--r-- | perl-install/network/netconnect.pm | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm index f0cd7e7ea..afc205a92 100644 --- a/perl-install/network/netconnect.pm +++ b/perl-install/network/netconnect.pm @@ -954,6 +954,7 @@ Do you really want to reconfigure this device?"), $track_network_id = $::isStandalone && $ethntf->{HWADDR} || detect_devices::isLaptop(); delete $ethntf->{NETWORK}; delete $ethntf->{BROADCAST}; + delete $ethntf->{TYPE} unless $netcnx->{type} eq 'adsl' && member($adsl_type, qw(manual dhcp)); @fields = qw(IPADDR NETMASK); $netc->{dhcp_client} ||= (find { -x "$::prefix/sbin/$_" } qw(dhclient dhcpcd pump dhcpxd)) || "dhcp-client"; $netc->{dhcp_client} = "dhcp-client" if $netc->{dhcp_client} eq "dhclient"; |