From: Serge Hallyn <serge.hallyn@canonical.com>
Date: Thu, 20 Dec 2012 22:14:49 +0000 (-0600)
Subject: Clear environment for container
X-Git-Tag: lxc-0.9.0.alpha3~1^2~101
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=964fe051e9dc21be6c52ccf5b9ff47a8aea396fc;p=thirdparty%2Flxc.git

Clear environment for container

Clear env before starting a container.  Do it right before setting
the container=lxc variable.

Signed-off-by: Serge Hallyn <serge.hallyn@ubuntu.com>
Acked-by: Stéphane Graber <stgraber@ubuntu.com>
---

diff --git a/src/lxc/lxc_start.c b/src/lxc/lxc_start.c
index cedd908c0..fb756ddba 100644
--- a/src/lxc/lxc_start.c
+++ b/src/lxc/lxc_start.c
@@ -130,6 +130,10 @@ int main(int argc, char *argv[])
 			 my_args.progname, my_args.quiet))
 		return err;
 
+	if (clearenv()) {
+		SYSERROR("failed to clear environment");
+		/* don't error out though */
+	}
 	if (putenv("container=lxc")) {
 		SYSERROR("failed to set environment variable");
 		return err;
diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
index fd77aac70..5919d2c57 100644
--- a/src/lxc/lxccontainer.c
+++ b/src/lxc/lxccontainer.c
@@ -364,6 +364,11 @@ static bool lxcapi_start(struct lxc_container *c, int useinit, char * const argv
 		setsid();
 	}
 
+	if (clearenv()) {
+		SYSERROR("failed to clear environment");
+		/* don't error out though */
+	}
+
 	if (putenv("container=lxc")) {
 		fprintf(stderr, "failed to set environment variable");
 		if (daemonize) {