NuKVM/libvirt
3
0
Fork 0
mirror of https://github.com/libvirt/libvirt.git synced 2025-02-25 18:55:26 -06:00
Code Issues Packages Projects Releases Wiki Activity

Make lxcContainerSetStdio the last thing to be called in container startup

Browse Source 
Once lxcContainerSetStdio is invoked, logging will not work as
expected in libvirt_lxc. So make sure this is the last thing to
be called, in particular after setting the security process label
This commit is contained in:
Daniel P. Berrange 2012-05-01 10:48:52 +01:00
parent 43ee987312
commit 07cf96ecc7
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/lxc/lxc_container.c
View File

@ -1366,14 +1366,14 @@ static int lxcContainerChild( void *data )
goto cleanup; goto cleanup;
} }
if (lxcContainerSetStdio(argv->monitor, ttyfd, argv->handshakefd) < 0) {
goto cleanup;
}
VIR_DEBUG("Setting up security labeling"); VIR_DEBUG("Setting up security labeling");
if (virSecurityManagerSetProcessLabel(argv->securityDriver, vmDef) < 0) if (virSecurityManagerSetProcessLabel(argv->securityDriver, vmDef) < 0)
goto cleanup; goto cleanup;
if (lxcContainerSetStdio(argv->monitor, ttyfd, argv->handshakefd) < 0) {
goto cleanup;
}
ret = 0; ret = 0;
cleanup: cleanup:
VIR_FREE(ttyPath); VIR_FREE(ttyPath);