summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tvignaud@mandriva.org>2004-01-20 15:28:31 +0000
committerThierry Vignaud <tvignaud@mandriva.org>2004-01-20 15:28:31 +0000
commit6d26b953c36cf6e79aed52dc4e8045638fe9ab2a (patch)
tree7bbbf5c3d1114ecc2736a6a8a089ecfde23d041d
parent6c79b492ff8ff67813df8391133c13dea1aad123 (diff)
downloaddrakx-backup-do-not-use-6d26b953c36cf6e79aed52dc4e8045638fe9ab2a.tar
drakx-backup-do-not-use-6d26b953c36cf6e79aed52dc4e8045638fe9ab2a.tar.gz
drakx-backup-do-not-use-6d26b953c36cf6e79aed52dc4e8045638fe9ab2a.tar.bz2
drakx-backup-do-not-use-6d26b953c36cf6e79aed52dc4e8045638fe9ab2a.tar.xz
drakx-backup-do-not-use-6d26b953c36cf6e79aed52dc4e8045638fe9ab2a.zip
fix gateway reading and writing
-rw-r--r--perl-install/network/netconnect.pm4
1 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index e0f26a22d..61e62717b 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -432,6 +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->{connection} ||= $l{Name};
$modem->{domain} ||= $l{Domain};
($modem->{dns1}, $modem->{dns2}) = split(',', $l{DNS});
@@ -449,6 +450,7 @@ 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);
+
},
name => N("Dialup: account options"),
data => sub {
@@ -508,7 +510,7 @@ killall pppd
data => sub {
[
{ label => N("Gateway"), type => "list", val => \$modem->{auto_gateway}, list => [ N("Automatic"), N("Manual") ] },
- { label => N("Gateway IP address"), val => \$modem->{dns1},
+ { label => N("Gateway IP address"), val => \$modem->{Gateway},
disabled => sub { $modem->{auto_gateway} eq N("Automatic") } },
];
},