External/libvirt
1
0
Fork 0
mirror of https://gitlab.com/libvirt/libvirt.git synced 2025-03-20 07:59:00 +00:00
Code

lxc: container: Build init cmd before we close stdout

Browse Source 
That way we can log the 'init' argv for debugging.
This commit is contained in:
Cole Robinson 2011-05-06 10:50:00 -04:00
parent 0719c3d64c
commit 0ed4aa448e
1 changed files with 25 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/lxc/lxc_container.c
View File

@ -94,15 +94,14 @@ struct __lxc_child_argv {
/** /**
* lxcContainerExecInit: * lxcContainerBuildInitCmd:
* @vmDef: pointer to vm definition structure * @vmDef: pointer to vm definition structure
* *
* Exec the container init string. The container init will replace then * Build a virCommandPtr for launching the container 'init' process
* be running in the current process
* *
* Does not return * Returns a virCommandPtr
*/ */
static int lxcContainerExecInit(virDomainDefPtr vmDef) static virCommandPtr lxcContainerBuildInitCmd(virDomainDefPtr vmDef)
{ {
char uuidstr[VIR_UUID_STRING_BUFLEN]; char uuidstr[VIR_UUID_STRING_BUFLEN];
virCommandPtr cmd; virCommandPtr cmd;
@ -116,7 +115,7 @@ static int lxcContainerExecInit(virDomainDefPtr vmDef)
virCommandAddEnvPair(cmd, "LIBVIRT_LXC_UUID", uuidstr); virCommandAddEnvPair(cmd, "LIBVIRT_LXC_UUID", uuidstr);
virCommandAddEnvPair(cmd, "LIBVIRT_LXC_NAME", vmDef->name); virCommandAddEnvPair(cmd, "LIBVIRT_LXC_NAME", vmDef->name);
return virCommandExec(cmd); return cmd;
} }
/** /**
@ -753,28 +752,34 @@ static int lxcContainerChild( void *data )
lxc_child_argv_t *argv = data; lxc_child_argv_t *argv = data;
virDomainDefPtr vmDef = argv->config; virDomainDefPtr vmDef = argv->config;
int ttyfd; int ttyfd;
int ret = -1;
char *ttyPath; char *ttyPath;
virDomainFSDefPtr root; virDomainFSDefPtr root;
virCommandPtr cmd = NULL;
if (NULL == vmDef) { if (NULL == vmDef) {
lxcError(VIR_ERR_INTERNAL_ERROR, lxcError(VIR_ERR_INTERNAL_ERROR,
"%s", _("lxcChild() passed invalid vm definition")); "%s", _("lxcChild() passed invalid vm definition"));
return -1; goto cleanup;
} }
cmd = lxcContainerBuildInitCmd(vmDef);
virCommandWriteArgLog(cmd, 1);
root = virDomainGetRootFilesystem(vmDef); root = virDomainGetRootFilesystem(vmDef);
if (root) { if (root) {
if (virAsprintf(&ttyPath, "%s%s", root->src, argv->ttyPath) < 0) { if (virAsprintf(&ttyPath, "%s%s", root->src, argv->ttyPath) < 0) {
virReportOOMError(); virReportOOMError();
return -1; goto cleanup;
} }
} else { } else {
if (!(ttyPath = strdup(argv->ttyPath))) { if (!(ttyPath = strdup(argv->ttyPath))) {
virReportOOMError(); virReportOOMError();
return -1; goto cleanup;
} }
} }
VIR_DEBUG("Container TTY path: %s", ttyPath);
ttyfd = open(ttyPath, O_RDWR|O_NOCTTY); ttyfd = open(ttyPath, O_RDWR|O_NOCTTY);
if (ttyfd < 0) { if (ttyfd < 0) {
@ -782,34 +787,38 @@ static int lxcContainerChild( void *data )
_("Failed to open tty %s"), _("Failed to open tty %s"),
ttyPath); ttyPath);
VIR_FREE(ttyPath); VIR_FREE(ttyPath);
return -1; goto cleanup;
} }
VIR_FREE(ttyPath); VIR_FREE(ttyPath);
if (lxcContainerSetStdio(argv->monitor, ttyfd) < 0) { if (lxcContainerSetStdio(argv->monitor, ttyfd) < 0) {
VIR_FORCE_CLOSE(ttyfd); VIR_FORCE_CLOSE(ttyfd);
return -1; goto cleanup;
} }
VIR_FORCE_CLOSE(ttyfd); VIR_FORCE_CLOSE(ttyfd);
if (lxcContainerSetupMounts(vmDef, root) < 0) if (lxcContainerSetupMounts(vmDef, root) < 0)
return -1; goto cleanup;
/* Wait for interface devices to show up */ /* Wait for interface devices to show up */
if (lxcContainerWaitForContinue(argv->monitor) < 0) if (lxcContainerWaitForContinue(argv->monitor) < 0)
return -1; goto cleanup;
/* rename and enable interfaces */ /* rename and enable interfaces */
if (lxcContainerRenameAndEnableInterfaces(argv->nveths, if (lxcContainerRenameAndEnableInterfaces(argv->nveths,
argv->veths) < 0) argv->veths) < 0)
return -1; goto cleanup;
/* drop a set of root capabilities */ /* drop a set of root capabilities */
if (lxcContainerDropCapabilities() < 0) if (lxcContainerDropCapabilities() < 0)
return -1; goto cleanup;
/* this function will only return if an error occured */ /* this function will only return if an error occured */
return lxcContainerExecInit(vmDef); ret = virCommandExec(cmd);
cleanup:
virCommandFree(cmd);
return ret;
} }
static int userns_supported(void) static int userns_supported(void)