From: Daniel Lezcano <dlezcano@fr.ibm.com>
Date: Tue, 20 Jul 2010 11:45:44 +0000 (+0200)
Subject: initialize capabilities for lxc-start and lxc-execute
X-Git-Tag: lxc-0.7.2~16
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0ed9cc8b0000f7e1afbb7d7f404f6265e4d3b97e;p=thirdparty%2Flxc.git

initialize capabilities for lxc-start and lxc-execute

Signed-off-by: Daniel Lezcano <dlezcano@fr.ibm.com>
---

diff --git a/src/lxc/lxc_execute.c b/src/lxc/lxc_execute.c
index c3a0cd780..f4808593e 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 7aa17ff61..661764a4b 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;