summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFrederic Crozat <fcrozat@mandriva.com>2010-04-23 11:40:06 +0000
committerFrederic Crozat <fcrozat@mandriva.com>2010-04-23 11:40:06 +0000
commit6903fbf5a5ce4c4919d51183ab8418827b20ca8e (patch)
treefd331929be9b0ec9ed71ed4f916dc6d5f5c67e04
parent776f4edda81a8139ac2f18b84789e45ec60c1609 (diff)
downloaddrakx-6903fbf5a5ce4c4919d51183ab8418827b20ca8e.tar
drakx-6903fbf5a5ce4c4919d51183ab8418827b20ca8e.tar.gz
drakx-6903fbf5a5ce4c4919d51183ab8418827b20ca8e.tar.bz2
drakx-6903fbf5a5ce4c4919d51183ab8418827b20ca8e.tar.xz
drakx-6903fbf5a5ce4c4919d51183ab8418827b20ca8e.zip
test if network is up before trying to configure it (blino)
-rwxr-xr-xperl-install/standalone/finish-install7
1 files changed, 7 insertions, 0 deletions
diff --git a/perl-install/standalone/finish-install b/perl-install/standalone/finish-install
index 80240e6b5..09f62ab1d 100755
--- a/perl-install/standalone/finish-install
+++ b/perl-install/standalone/finish-install
@@ -100,6 +100,13 @@ sub ask_country() {
sub ask_network() {
require network::tools;
return if network::tools::has_network_connection();
+
+ #- test again connection after waiting for network-up service
+ my $w = $in->wait_message(N("Please wait"), N("Testing your connection..."));
+ services::start('network-up');
+ undef $w;
+ return if network::tools::has_network_connection();
+
require network::netconnect;
my $modules_conf = modules::any_conf->read;
network::netconnect::real_main($net, $in, $modules_conf);