1 files changed, 10 insertions, 0 deletions

diff --git a/bitbake/bin/bitbake b/bitbake/bin/bitbake
index cca2b8d29b..a0a2baa4bc 100755
--- a/bitbake/bin/bitbake
+++ b/bitbake/bin/bitbake
@@ -302,6 +302,7 @@ def main():
         # we start a stub server that is actually a XMLRPClient that connects to a real server
         server = servermodule.BitBakeXMLRPCClient(configParams.observe_only)
         server.saveConnectionDetails(configParams.remote_server)
+        server.saveConnectionConfigParams(configParams)
 
     if not configParams.server_only:
         # Collect the feature set for the UI
@@ -312,11 +313,20 @@ def main():
                 server_connection = server.establishConnection(featureset)
             except:
                 sys.exit(1)
+            if not server_connection:
+                sys.exit(1)
             server_connection.terminate()
             sys.exit(0)
 
         # Setup a connection to the server (cooker)
         server_connection = server.establishConnection(featureset)
+        if not server_connection:
+            if configParams.kill_server:
+                bb.fatal("Server already killed")
+            configParams.bind = configParams.remote_server
+            start_server(servermodule, configParams, configuration)
+            bb.event.ui_queue = []
+            server_connection = server.establishConnection(featureset)
 
         # Restore the environment in case the UI needs it
         for k in cleanedvars: