From 3098c61eee8c6a1f3719d82c48366309a71d4155 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tvignaud@mandriva.org>
Date: Tue, 25 Nov 2003 14:30:51 +0000
Subject: fix #6184: read back "Connection Name" and "Domain Name" fields

---
 perl-install/network/modem.pm | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'perl-install/network/modem.pm')

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;
     }
-- 
cgit v1.2.1