summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordamien <damien@mandriva.com>2000-09-25 16:08:24 +0000
committerdamien <damien@mandriva.com>2000-09-25 16:08:24 +0000
commit8e690ad57bb02fe2bd838aa60b80774149971047 (patch)
tree47e4cd2b7a2aa8aa466cc4865a8d84641628d10f
parent67447f3143ad324dc29cad4403aac5ae08278347 (diff)
downloaddrakx-backup-do-not-use-8e690ad57bb02fe2bd838aa60b80774149971047.tar
drakx-backup-do-not-use-8e690ad57bb02fe2bd838aa60b80774149971047.tar.gz
drakx-backup-do-not-use-8e690ad57bb02fe2bd838aa60b80774149971047.tar.bz2
drakx-backup-do-not-use-8e690ad57bb02fe2bd838aa60b80774149971047.tar.xz
drakx-backup-do-not-use-8e690ad57bb02fe2bd838aa60b80774149971047.zip
stc
-rw-r--r--perl-install/ChangeLog6
-rw-r--r--perl-install/network.pm1
2 files changed, 7 insertions, 0 deletions
diff --git a/perl-install/ChangeLog b/perl-install/ChangeLog
index b4a7f7d0c..178c4be46 100644
--- a/perl-install/ChangeLog
+++ b/perl-install/ChangeLog
@@ -1,7 +1,13 @@
2000-09-25 dam's <damien@mandrakesoft.com>
+ * network.pm (write_resolv_conf): write '# ppp temp entry adsl' in
+ /etc/resolv.conf if needed.
+
+ * netconnect.pm : adsl connection does'nt need any dns anymore.
+
* netconnect.pm (read_net_conf): created. draknet now stores and
reload the config.
+
* netconnect.pm (main): if the user is french and uses french
keyboard, don't ask his country.
diff --git a/perl-install/network.pm b/perl-install/network.pm
index 0471cc5e3..765888c82 100644
--- a/perl-install/network.pm
+++ b/perl-install/network.pm
@@ -99,6 +99,7 @@ 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;
+ $netc->{NET_DEVICE} =~ /ppp/ and print F "# ppp temp entry\n";
print F "\n";
print F "# $_\n" foreach @unknown;