Merge branch 'dev-mtsugawa-euca-11476' into maint-4.2

eucalyptus · Nov 14, 2015 · e90ee0b · e90ee0b
2 parents 5fe7233 + 0b46f2d
commit e90ee0b
Showing 1 changed file with 9 additions and 8 deletions.
diff --git a/net/eucanetd.c b/net/eucanetd.c
@@ -427,14 +427,6 @@ int main(int argc, char **argv)
         }
         update_globalnet_failed = FALSE;
 
-        // whether or not updates have occurred due to remote content being updated, read local networking info
-        rc = eucanetd_read_latest_network();
-        if (rc) {
-            LOGWARN("eucanetd_read_latest_network failed, skipping update: check above errors for details\n");
-            // if the local read failed for some reason, skip any attempt to update (leave current state in place)
-            update_globalnet = FALSE;
-        }
-
         if (eucanetdPeer == PEER_INVALID) {
             eucanetdPeer = eucanetd_detect_peer(globalnetworkinfo);
             if (PEER_IS_NONE(eucanetdPeer)) {
@@ -461,6 +453,15 @@ int main(int argc, char **argv)
                 exit(1);
             }
         }
+
+        // whether or not updates have occurred due to remote content being updated, read local networking info
+        rc = eucanetd_read_latest_network();
+        if (rc) {
+            LOGWARN("eucanetd_read_latest_network failed, skipping update: check above errors for details\n");
+            // if the local read failed for some reason, skip any attempt to update (leave current state in place)
+            update_globalnet = FALSE;
+        }
+
         // Do we need to run the network upgrade stuff?
         if (pDriverHandler->upgrade) {
             if (pDriverHandler->upgrade(globalnetworkinfo) == 0) {