diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2004-02-23 08:25:45 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2004-02-23 08:25:45 +0000 |
| commit | ac806ad828f60b4373b5f934e5a1d21b9bdb586d (patch) | |
| tree | f2266750835260a09770648c8135f3d82bfcb249 /perl-install | |
| parent | cf098756533ce789f72a6e2239ece1c262a9ee0f (diff) | |
| download | drakx-ac806ad828f60b4373b5f934e5a1d21b9bdb586d.tar drakx-ac806ad828f60b4373b5f934e5a1d21b9bdb586d.tar.gz drakx-ac806ad828f60b4373b5f934e5a1d21b9bdb586d.tar.bz2 drakx-ac806ad828f60b4373b5f934e5a1d21b9bdb586d.tar.xz drakx-ac806ad828f60b4373b5f934e5a1d21b9bdb586d.zip | |
(ppp_read_conf) really default to dynamic dns, gateway and ip (really fix #7705)
Diffstat (limited to 'perl-install')
| -rw-r--r-- | perl-install/network/modem.pm | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/perl-install/network/modem.pm b/perl-install/network/modem.pm index 2fd484cc3..7d556a616 100644 --- a/perl-install/network/modem.pm +++ b/perl-install/network/modem.pm @@ -39,9 +39,9 @@ sub ppp_read_conf { #my $secret = network::tools::read_secret_backend(); #my @cnx_list = map { $_->{server} } @$secret; $modem->{$_} ||= '' foreach qw(connection phone login passwd auth domain dns1 dns2); - $modem->{auto_gateway} ||= $modem->{Gateway} ne '0.0.0.0' ? N("Manual") : N("Automatic"); - $modem->{auto_ip} ||= $modem->{IPAdddr} ne '0.0.0.0' ? N("Manual") : N("Automatic"); - $modem->{auto_dns} ||= defined $modem->{dns1} || defined $modem->{dns2} ? N("Manual") : N("Automatic"); + $modem->{auto_gateway} ||= defined $modem->{Gateway} && $modem->{Gateway} ne '0.0.0.0' ? N("Manual") : N("Automatic"); + $modem->{auto_ip} ||= defined $modem->{IPAddr} && $modem->{IPAddr} ne '0.0.0.0' ? N("Manual") : N("Automatic"); + $modem->{auto_dns} ||= $modem->{dns1} || $modem->{dns2} ? N("Manual") : N("Automatic"); } #-----modem conf |