[lxc-devel] [PATCH] remove redundant, too-early call to clearenv in api_start call.

[Stéphane Graber]

On 02/19/2013 03:39 PM, Serge Hallyn wrote:
> 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 at ubuntu.com>

Acked-by: Stéphane Graber <stgraber at ubuntu.com>

Pushed to staging. Thanks

> ---
>  src/lxc/lxccontainer.c | 15 ---------------
>  1 file changed, 15 deletions(-)
> 
> diff --git a/src/lxc/lxccontainer.c b/src/lxc/lxccontainer.c
> index f24c39f..bcfc8b6 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);
> 


-- 
Stéphane Graber
Ubuntu developer
http://www.ubuntu.com

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 901 bytes
Desc: OpenPGP digital signature
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20130219/a041bba6/attachment.pgp>