diff options
| author | Thierry Vignaud <tv@mageia.org> | 2012-09-05 17:29:03 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2012-09-05 17:29:03 +0000 |
| commit | ea1061dfa704b77fa3beadec17c5ca56ff0c9bc1 (patch) | |
| tree | 32ec906bf71c33d58f10cc8b3a63ac46539a9e67 | |
| parent | aef201986a3a46233069f0da0ab895b52ca97b5f (diff) | |
| download | drakx-net-ea1061dfa704b77fa3beadec17c5ca56ff0c9bc1.tar drakx-net-ea1061dfa704b77fa3beadec17c5ca56ff0c9bc1.tar.gz drakx-net-ea1061dfa704b77fa3beadec17c5ca56ff0c9bc1.tar.bz2 drakx-net-ea1061dfa704b77fa3beadec17c5ca56ff0c9bc1.tar.xz drakx-net-ea1061dfa704b77fa3beadec17c5ca56ff0c9bc1.zip | |
(apply_connection) wait for network to show up the same way as in the
installer (Derek Jennings, mga#5830)
(backported from trunk)
| -rw-r--r-- | NEWS | 2 | ||||
| -rw-r--r-- | lib/network/netconnect.pm | 13 |
2 files changed, 8 insertions, 7 deletions
@@ -1,4 +1,6 @@ - install rtlwifi-firmware for r8712u driver (#6064) +- wait for network to show up the same way as in the installer + (Derek Jennings, mga#5830) 1.12 - fix connectivity test during install (and possibly standalone) by 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 |