From 77a85bb86a3d125a4dae599658dc97a7873ea02a Mon Sep 17 00:00:00 2001
From: damien <damien@mandriva.com>
Date: Tue, 12 Mar 2002 14:01:20 +0000
Subject: changed timeout for testing internet connection

---
 perl-install/network/netconnect.pm | 3 ++-
 perl-install/network/tools.pm      | 7 ++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

(limited to 'perl-install')

diff --git a/perl-install/network/netconnect.pm b/perl-install/network/netconnect.pm
index 100522dfe..cf5a75bfd 100644
--- a/perl-install/network/netconnect.pm
+++ b/perl-install/network/netconnect.pm
@@ -254,7 +254,8 @@ ifdown eth0
     }
 
     write_initscript();
-    $::isStandalone && member($netc->{internet_cnx_choice}, ('modem', 'adsl', 'isdn')) and $success = ask_connect_now();
+    $::isStandalone && member($netc->{internet_cnx_choice}, ('modem', 'adsl', 'isdn')) and
+      $success = ask_connect_now($netc->{internet_cnx_choice});
 
   step_3:
 
diff --git a/perl-install/network/tools.pm b/perl-install/network/tools.pm
index 8671b8b62..4d8fff949 100644
--- a/perl-install/network/tools.pm
+++ b/perl-install/network/tools.pm
@@ -34,6 +34,7 @@ sub write_secret_backend {
 }
 
 sub ask_connect_now {
+    my ($type) = @_;
     $::Wizard_no_previous=1;
     #- FIXME : code the exception to be generated by ask_yesorno, to be able to remove the $::Wizard_no_previous=1;
     if ($in->ask_yesorno(_("Internet configuration"),
@@ -43,7 +44,11 @@ sub ask_connect_now {
 	{
 	    my $w = $in->wait_message('', _("Testing your connection..."), 1);
 	    connect_backend();
-	    sleep 10;
+	    my $s = 30;
+	    $type =~ /modem/ and $s=50;
+	    $type =~ /adsl/ and $s=35;
+	    $type =~ /isdn/ and $s=20;
+	    sleep $s;
 	    my $netc = {};
 	    $up=connected();
 	}
-- 
cgit v1.2.1