[lxc-devel] [patch -lxc 3/6] initialize capabilities for lxc-start and lxc-execute

Daniel Lezcano dlezcano at fr.ibm.com
Mon Jul 12 12:56:45 UTC 2010


Signed-off-by: Daniel Lezcano <dlezcano at fr.ibm.com>
---
 src/lxc/lxc_execute.c |    5 ++++-
 src/lxc/lxc_start.c   |    4 ++++
 2 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/src/lxc/lxc_execute.c b/src/lxc/lxc_execute.c
index c3a0cd7..f480859 100644
--- a/src/lxc/lxc_execute.c
+++ b/src/lxc/lxc_execute.c
@@ -31,7 +31,7 @@
 #include <sys/stat.h>
 #include <sys/param.h>
 
-
+#include "caps.h"
 #include "lxc.h"
 #include "log.h"
 #include "conf.h"
@@ -93,6 +93,9 @@ int main(int argc, char *argv[])
 
 	lxc_list_init(&defines);
 
+	if (lxc_caps_init())
+		return -1;
+
 	if (lxc_arguments_parse(&my_args, argc, argv))
 		return -1;
 
diff --git a/src/lxc/lxc_start.c b/src/lxc/lxc_start.c
index 7aa17ff..661764a 100644
--- a/src/lxc/lxc_start.c
+++ b/src/lxc/lxc_start.c
@@ -41,6 +41,7 @@
 #include <net/if.h>
 
 #include "log.h"
+#include "caps.h"
 #include "lxc.h"
 #include "conf.h"
 #include "cgroup.h"
@@ -101,6 +102,9 @@ int main(int argc, char *argv[])
 
 	lxc_list_init(&defines);
 
+	if (lxc_caps_init())
+		return err;
+
 	if (lxc_arguments_parse(&my_args, argc, argv))
 		return err;
 
-- 
1.7.0.4





More information about the lxc-devel mailing list