forked from pool/libvirt
This commit is contained in:
committed by
Git OBS Bridge
parent
6ba690802b
commit
4a6373529e
10
clone.patch
10
clone.patch
@@ -2,7 +2,7 @@ Index: src/lxc_container.c
|
||||
===================================================================
|
||||
--- src/lxc_container.c.orig
|
||||
+++ src/lxc_container.c
|
||||
@@ -603,6 +603,9 @@ int lxcContainerStart(virDomainDefPtr de
|
||||
@@ -617,6 +617,9 @@ int lxcContainerStart(virDomainDefPtr de
|
||||
lxc_child_argv_t args = { def, nveths, veths, control, ttyPath };
|
||||
|
||||
/* allocate a stack for the container */
|
||||
@@ -10,9 +10,9 @@ Index: src/lxc_container.c
|
||||
+ stacksize *= 2;
|
||||
+#endif
|
||||
if (VIR_ALLOC_N(stack, stacksize) < 0) {
|
||||
lxcError(NULL, NULL, VIR_ERR_NO_MEMORY, NULL);
|
||||
virReportOOMError(NULL);
|
||||
return -1;
|
||||
@@ -614,7 +617,11 @@ int lxcContainerStart(virDomainDefPtr de
|
||||
@@ -628,7 +631,11 @@ int lxcContainerStart(virDomainDefPtr de
|
||||
if (def->nets != NULL)
|
||||
flags |= CLONE_NEWNET;
|
||||
|
||||
@@ -24,7 +24,7 @@ Index: src/lxc_container.c
|
||||
VIR_FREE(stack);
|
||||
DEBUG("clone() returned, %d", pid);
|
||||
|
||||
@@ -640,18 +647,26 @@ int lxcContainerAvailable(int features)
|
||||
@@ -654,18 +661,26 @@ int lxcContainerAvailable(int features)
|
||||
char *childStack;
|
||||
char *stack;
|
||||
int childStatus;
|
||||
@@ -52,4 +52,4 @@ Index: src/lxc_container.c
|
||||
+#endif
|
||||
VIR_FREE(stack);
|
||||
if (cpid < 0) {
|
||||
DEBUG("clone call returned %s, container support is not enabled",
|
||||
char ebuf[1024];
|
||||
|
Reference in New Issue
Block a user