diff options
| author | Pascal Rigaux <pixel@mandriva.com> | 2004-10-15 12:33:21 +0000 |
|---|---|---|
| committer | Pascal Rigaux <pixel@mandriva.com> | 2004-10-15 12:33:21 +0000 |
| commit | 2129b98f49dee51358c410363215e5457d4004d8 (patch) | |
| tree | 0cca2a9263f5ccbc378ba811dc8e181758fa3fb2 /perl-install/network/netconnect.pm | |
| parent | 11abeeba23045c067ed061e665e75304c594f278 (diff) | |
| download | drakx-backup-do-not-use-2129b98f49dee51358c410363215e5457d4004d8.tar drakx-backup-do-not-use-2129b98f49dee51358c410363215e5457d4004d8.tar.gz drakx-backup-do-not-use-2129b98f49dee51358c410363215e5457d4004d8.tar.bz2 drakx-backup-do-not-use-2129b98f49dee51358c410363215e5457d4004d8.tar.xz drakx-backup-do-not-use-2129b98f49dee51358c410363215e5457d4004d8.zip | |
make perl_checker happy
Diffstat (limited to 'perl-install/network/netconnect.pm')
| -rw-r--r-- | perl-install/network/netconnect.pm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm index 008ba7cb3..6771b8210 100644 --- a/perl-install/network/netconnect.pm +++ b/perl-install/network/netconnect.pm @@ -958,7 +958,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)); + delete $ethntf->{TYPE} if $netcnx->{type} ne '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"; |