diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2004-01-20 15:46:01 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2004-01-20 15:46:01 +0000 |
| commit | f692e2d9ff6cc99bc8a092f28041839c4a1aa2d5 (patch) | |
| tree | 3603926fdd41211864eda220277b8c39e6f3bd6f | |
| parent | 92af971a3ff8e2979074f607f33cdf072dfaedce (diff) | |
| download | drakx-f692e2d9ff6cc99bc8a092f28041839c4a1aa2d5.tar drakx-f692e2d9ff6cc99bc8a092f28041839c4a1aa2d5.tar.gz drakx-f692e2d9ff6cc99bc8a092f28041839c4a1aa2d5.tar.bz2 drakx-f692e2d9ff6cc99bc8a092f28041839c4a1aa2d5.tar.xz drakx-f692e2d9ff6cc99bc8a092f28041839c4a1aa2d5.zip | |
read back new fields
| -rw-r--r-- | perl-install/network/netconnect.pm | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm index 61e62717b..b9b2b98df 100644 --- a/perl-install/network/netconnect.pm +++ b/perl-install/network/netconnect.pm @@ -432,7 +432,7 @@ killall pppd $modem ||= $netcnx->{$netcnx->{type}}; $modem->{device} ||= $first_modem->()->{device}; my %l = getVarsFromSh("$::prefix/usr/share/config/kppprc"); - $modem->{Gateway} ||= $l{Gateway}; + $modem->{$_} ||= $l{$_} foreach qw (Gateway IPAddr SubnetMask); $modem->{connection} ||= $l{Name}; $modem->{domain} ||= $l{Domain}; ($modem->{dns1}, $modem->{dns2}) = split(',', $l{DNS}); @@ -443,6 +443,7 @@ killall pppd foreach (cat_("/etc/sysconfig/network-scripts/ifcfg-ppp0")) { /NAME=(['"]?)(.*)\1/ and $modem->{login} ||= $2; } + $modem->{login} ||= $l{Username}; my $secret = network::tools::read_secret_backend(); foreach (@$secret) { $modem->{passwd} ||= $_->{passwd} if $_->{login} eq $modem->{login}; @@ -450,7 +451,9 @@ killall pppd #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} eq '0.0.0.0' ? N("Automatic") : N("Manual"); + $modem->{auto_ip} ||= $modem->{IPAdddr} eq '0.0.0.0' ? N("Automatic") : N("Manual"); + $modem->{auto_dns} ||= defined $modem->{dns1} || defined $modem->{dns2} ? N("Manual") : N("Automatic"); }, name => N("Dialup: account options"), data => sub { |