提交 8ee6a99e 编写于 作者: C Cédric Bosdonnat

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.
上级 cedd2ab2
...@@ -2444,13 +2444,13 @@ virLXCControllerRun(virLXCControllerPtr ctrl) ...@@ -2444,13 +2444,13 @@ virLXCControllerRun(virLXCControllerPtr ctrl)
if (lxcControllerClearCapabilities() < 0) if (lxcControllerClearCapabilities() < 0)
goto cleanup; goto cleanup;
if (virLXCControllerDaemonHandshake(ctrl) < 0)
goto cleanup;
for (i = 0; i < ctrl->nconsoles; i++) for (i = 0; i < ctrl->nconsoles; i++)
if (virLXCControllerConsoleSetNonblocking(&(ctrl->consoles[i])) < 0) if (virLXCControllerConsoleSetNonblocking(&(ctrl->consoles[i])) < 0)
goto cleanup; goto cleanup;
if (virLXCControllerDaemonHandshake(ctrl) < 0)
goto cleanup;
/* We must not hold open a dbus connection for life /* We must not hold open a dbus connection for life
* of LXC instance, since dbus-daemon is limited to * of LXC instance, since dbus-daemon is limited to
* only a few 100 connections by default * only a few 100 connections by default
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册