From 0c30747ef90647337b50cc02bcc5490c52944e78 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mageia.org>
Date: Tue, 4 Sep 2012 18:12:39 +0000
Subject: (apply_connection) wait for network to show up the same way as in the
 installer (Derek Jennings, mga#5830)

---
 NEWS                      |  3 +++
 lib/network/netconnect.pm | 13 ++++++-------
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/NEWS b/NEWS
index 0fc9a77..a335567 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+- wait for network to show up the same way as in the installer
+  (Derek Jennings, mga#5830)
+
 1.13:
 - install rtlwifi-firmware for r8712u driver (#6064)
 - fix installing ralink firmware for 2860 and 2870 chipsets (#5072)
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
-- 
cgit v1.2.1