summaryrefslogtreecommitdiffstats
path: root/lib/network
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mageia.org>2012-09-04 18:12:39 +0000
committerThierry Vignaud <tv@mageia.org>2012-09-04 18:12:39 +0000
commit0c30747ef90647337b50cc02bcc5490c52944e78 (patch)
tree2afa06527ddb3fc119d5ed3e6f04ed188c09a1ac /lib/network
parent21fd6abda44db2d8282a3c936c4db0f0c1c7c927 (diff)
downloaddrakx-net-0c30747ef90647337b50cc02bcc5490c52944e78.tar
drakx-net-0c30747ef90647337b50cc02bcc5490c52944e78.tar.gz
drakx-net-0c30747ef90647337b50cc02bcc5490c52944e78.tar.bz2
drakx-net-0c30747ef90647337b50cc02bcc5490c52944e78.tar.xz
drakx-net-0c30747ef90647337b50cc02bcc5490c52944e78.zip
(apply_connection) wait for network to show up the same way as in the
installer (Derek Jennings, mga#5830)
Diffstat (limited to 'lib/network')
-rw-r--r--lib/network/netconnect.pm13
1 files changed, 6 insertions, 7 deletions
diff --git a/lib/network/netconnect.pm b/lib/network/netconnect.pm
index 55dbec8..8f50630 100644
--- a/lib/network/netconnect.pm
+++ b/lib/network/netconnect.pm
@@ -314,13 +314,12 @@ If you do not know it, keep the preselected protocol.") },
#- or start interface synchronously
if (!$::isInstall) {
services::start('network-up');
- } else {
- my $timeout = $connection->get_up_timeout;
- while ($timeout--) {
- my $status = $connection->get_status;
- last if $status;
- sleep 1;
- }
+ }
+ my $timeout = $connection->get_up_timeout;
+ while ($timeout--) {
+ my $status = $connection->get_status;
+ last if $status;
+ sleep 1;
}
$success = $connection->get_status;
# try to resolve the network address for some time