diff options
| author | damien <damien@mandriva.com> | 2002-03-12 14:01:20 +0000 |
|---|---|---|
| committer | damien <damien@mandriva.com> | 2002-03-12 14:01:20 +0000 |
| commit | 77a85bb86a3d125a4dae599658dc97a7873ea02a (patch) | |
| tree | 3fb25b39dbd61c7a95bc09b17216f78c1463c0f3 | |
| parent | 5b97cd80afe34e1e1ea673488d54f7d2c7b309f5 (diff) | |
| download | drakx-backup-do-not-use-77a85bb86a3d125a4dae599658dc97a7873ea02a.tar drakx-backup-do-not-use-77a85bb86a3d125a4dae599658dc97a7873ea02a.tar.gz drakx-backup-do-not-use-77a85bb86a3d125a4dae599658dc97a7873ea02a.tar.bz2 drakx-backup-do-not-use-77a85bb86a3d125a4dae599658dc97a7873ea02a.tar.xz drakx-backup-do-not-use-77a85bb86a3d125a4dae599658dc97a7873ea02a.zip | |
changed timeout for testing internet connection
| -rw-r--r-- | perl-install/network/netconnect.pm | 3 | ||||
| -rw-r--r-- | perl-install/network/tools.pm | 7 |
2 files changed, 8 insertions, 2 deletions
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(); } |