Skip to content

Commit

Permalink
remove redundant, too-early call to clearenv in api_start call.
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
hallyn authored and stgraber committed Feb 19, 2013
1 parent daaf41b commit 91e065e
Showing 1 changed file with 0 additions and 15 deletions.
15 changes: 0 additions & 15 deletions src/lxc/lxccontainer.c
Expand Up @@ -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);
Expand Down

0 comments on commit 91e065e

Please sign in to comment.