diff options
| author | Thierry Vignaud <tvignaud@mandriva.org> | 2003-11-25 14:30:51 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tvignaud@mandriva.org> | 2003-11-25 14:30:51 +0000 |
| commit | 3098c61eee8c6a1f3719d82c48366309a71d4155 (patch) | |
| tree | 51403540839607ed7d6e335a37b8d886d28347e3 | |
| parent | 7067dd201a157012c0d2bc8939f0198966c02ba1 (diff) | |
| download | drakx-3098c61eee8c6a1f3719d82c48366309a71d4155.tar drakx-3098c61eee8c6a1f3719d82c48366309a71d4155.tar.gz drakx-3098c61eee8c6a1f3719d82c48366309a71d4155.tar.bz2 drakx-3098c61eee8c6a1f3719d82c48366309a71d4155.tar.xz drakx-3098c61eee8c6a1f3719d82c48366309a71d4155.zip | |
fix #6184: read back "Connection Name" and "Domain Name" fields
| -rw-r--r-- | perl-install/network/modem.pm | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/perl-install/network/modem.pm b/perl-install/network/modem.pm index f6978adea..159b61698 100644 --- a/perl-install/network/modem.pm +++ b/perl-install/network/modem.pm @@ -13,10 +13,11 @@ sub configure { $netcnx->{type} = 'modem'; my $modem = $netcnx->{$netcnx->{type}}; $modem->{device} = $netc->{autodetect}{modem}; + my %l = getVarsFromSh("$::prefix/usr/share/config/kppprc"); + $modem->{connection} = $l{Name}; + $modem->{domain} = $l{Domain}; + ($modem->{dns1}, $modem->{dns2}) = split(',', $l{DNS}); - foreach (cat_("/usr/share/config/kppprc")) { - /^DNS=(.*)$/ and ($modem->{dns1}, $modem->{dns2}) = split(',', $1); - } foreach (cat_("/etc/sysconfig/network-scripts/chat-ppp0")) { /.*ATDT(\d*)/ and $modem->{phone} = $1; } |