From 9dc271a69126c966b2db2037ed0e89f989f7a8d5 Mon Sep 17 00:00:00 2001
From: damien <damien@mandriva.com>
Date: Fri, 29 Sep 2000 02:12:22 +0000
Subject: stc

---
 perl-install/ChangeLog  | 7 +++++++
 perl-install/network.pm | 6 +++---
 2 files changed, 10 insertions(+), 3 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index c7b3f162e..8c90bdc8e 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -1,3 +1,10 @@
+2000-09-29  dam's  <damien@mandrakesoft.com>
+
+	* netconnect.pm (intro): detection of internet
+	configuration/connexion state.
+	
+	* network.pm (write_resolv_conf): better "ppp temp nameserver" in resolv.conf
+
 2000-09-28  Pixel  <pixel@mandrakesoft.com>
 
 	* modules.pm (load_thiskind): add read_already_loaded cuz of
diff --git a/perl-install/network.pm b/perl-install/network.pm
index 62aa592c5..b91c66cdd 100644
--- a/perl-install/network.pm
+++ b/perl-install/network.pm
@@ -88,12 +88,11 @@ sub write_resolv_conf {
 
     my (%search, %dns, @unknown);
     local *F; open F, $file;
-    my $dns_auto;
     foreach (<F>) {
 	/^[#\s]*search\s+(.*?)\s*$/ and $search{$1} = $., next;
 	/^[#\s]*nameserver\s+(.*?)\s*$/ and $dns{$1} = $., next;
+	/^.*# ppp temp entry\s*$/ and next;
 	/^[#\s]*(\S.*?)\s*$/ and push @unknown, $1;
-	/^# ppp temp entry$/ and $dns_auto=1;
     }
 
     close F; open F, ">$file" or die "cannot write $file: $!";
@@ -101,9 +100,10 @@ sub write_resolv_conf {
     print F "search $netc->{DOMAINNAME} $netc->{DOMAINNAME2}\n\n" if ($netc->{DOMAINNAME} || $netc->{DOMAINNAME2});
     print F "# nameserver $_\n" foreach grep { ! exists $used_dns{$_} } sort { $dns{$a} <=> $dns{$b} } keys %dns;
     print F "nameserver $_\n" foreach  sort { $used_dns{$a} <=> $used_dns{$b} } grep { $_ } keys %used_dns;
-    $dns_auto or print F "# ppp temp entry\n";
     print F "\n";
     print F "# $_\n" foreach @unknown;
+    print F "\n";
+    print F "# ppp temp entry\n";
 
     #-res_init();		# reinit the resolver so DNS changes take affect
     1;
-- 
cgit v1.2.1