From: Serge Hallyn <serge.hallyn@ubuntu.com>
Date: Tue, 19 Feb 2013 20:39:31 +0000 (-0600)
Subject: remove redundant, too-early call to clearenv in api_start call.
X-Git-Tag: lxc-0.9.0.rc1~2^2~48
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=91e065ec331416b9d0941da86792bdbc8f10fadf;p=thirdparty%2Flxc.git

remove redundant, too-early call to clearenv in api_start call.

Ok, took a look, what happened was the clearenv calls used to be
in lxc_start and lxccontainer and lxc_execute (do lxc_start() callers)
themselves.  I moved those into do_start(), but the calls in
lxccontainer.c were never removed.

They should simply be removed altogether.  Trivial patch follows.

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

diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
index f24c39f18..bcfc8b61a 100644
--- a/src/lxc/lxccontainer.c
+++ b/src/lxc/lxccontainer.c
@@ -369,21 +369,6 @@ 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) {
-			lxc_container_put(c);
-			exit(1);
-		} else {
-			return false;
-		}
-	}
-
 reboot:
 	conf->reboot = 0;
 	ret = lxc_start(c->name, argv, conf, c->config_path);