OBS User unknown
2009-07-23 23:36:28 +00:00
committed by Git OBS Bridge
parent 4a6373529e
commit a54da721c4
12 changed files with 178 additions and 473 deletions

View File

@@ -2,7 +2,7 @@ Index: src/lxc_container.c
===================================================================
--- src/lxc_container.c.orig
+++ src/lxc_container.c
@@ -617,6 +617,9 @@ int lxcContainerStart(virDomainDefPtr de
@@ -791,6 +791,9 @@ int lxcContainerStart(virDomainDefPtr de
lxc_child_argv_t args = { def, nveths, veths, control, ttyPath };
/* allocate a stack for the container */
@@ -12,7 +12,7 @@ Index: src/lxc_container.c
if (VIR_ALLOC_N(stack, stacksize) < 0) {
virReportOOMError(NULL);
return -1;
@@ -628,7 +631,11 @@ int lxcContainerStart(virDomainDefPtr de
@@ -805,7 +808,11 @@ int lxcContainerStart(virDomainDefPtr de
if (def->nets != NULL)
flags |= CLONE_NEWNET;
@@ -24,12 +24,15 @@ Index: src/lxc_container.c
VIR_FREE(stack);
DEBUG("clone() returned, %d", pid);
@@ -654,18 +661,26 @@ int lxcContainerAvailable(int features)
@@ -831,6 +838,7 @@ int lxcContainerAvailable(int features)
char *childStack;
char *stack;
int childStatus;
+ int stacksize = getpagesize() * 4;
if (features & LXC_CONTAINER_FEATURE_USER)
flags |= CLONE_NEWUSER;
@@ -838,14 +846,21 @@ int lxcContainerAvailable(int features)
if (features & LXC_CONTAINER_FEATURE_NET)
flags |= CLONE_NEWNET;