From: Christian Brauner <christian.brauner@ubuntu.com>
Date: Thu, 14 Dec 2017 20:37:41 +0000 (+0100)
Subject: Merge pull request #2008 from tych0/share-ns-in-execute
X-Git-Tag: lxc-3.0.0.beta1~108
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec09a5a2de764ea0c09b368c6c1eab0aff4e2a57;p=thirdparty%2Flxc.git

Merge pull request #2008 from tych0/share-ns-in-execute

add --share-$NS= support to lxc-execute
---

ec09a5a2de764ea0c09b368c6c1eab0aff4e2a57
diff --cc src/lxc/tools/lxc_execute.c
index 7a94cc4bb,4b4120030..c25223682
--- a/src/lxc/tools/lxc_execute.c
+++ b/src/lxc/tools/lxc_execute.c
@@@ -189,12 -191,14 +197,17 @@@ int main(int argc, char *argv[]
  	if (my_args.gid)
  		c->lxc_conf->init_gid = my_args.gid;
  
+ 	if (!lxc_setup_shared_ns(&my_args, c)) {
+ 		lxc_container_put(c);
+ 		exit(EXIT_FAILURE);
+ 	}
+ 
  	c->daemonize = my_args.daemonize == 1;
  	bret = c->start(c, 1, my_args.argv);
 -	ret = c->error_num;
 +	if (c->daemonize)
 +		ret = EXIT_SUCCESS;
 +	else
 +		ret = c->error_num;
  	lxc_container_put(c);
  	if (!bret) {
  		fprintf(stderr, "Failed run an application inside container\n");