lxc: errors after the handshake won't be reported

Any error happening after the hand shake in the lxc controller
will not result in a failure as errors are checked during the handshake.
Move the handshake after the last possible error.

diff --git a/src/lxc/lxc_controller.c b/src/lxc/lxc_controller.c
index f55aadc7e7d701580a51daa4161d07f94b806bf5..825b4d40a753d1811205ac5ec93dfe3398e629e2 100644 (file)
--- a/src/lxc/lxc_controller.c
+++ b/src/lxc/lxc_controller.c
@@ -2444,13 +2444,13 @@ virLXCControllerRun(virLXCControllerPtr ctrl)
     if (lxcControllerClearCapabilities() < 0)
         goto cleanup;
 
-    if (virLXCControllerDaemonHandshake(ctrl) < 0)
-        goto cleanup;
-
     for (i = 0; i < ctrl->nconsoles; i++)
         if (virLXCControllerConsoleSetNonblocking(&(ctrl->consoles[i])) < 0)
             goto cleanup;
 
+    if (virLXCControllerDaemonHandshake(ctrl) < 0)
+        goto cleanup;
+
     /* We must not hold open a dbus connection for life
      * of LXC instance, since dbus-daemon is limited to
      * only a few 100 connections by default