From bb550c2444db183853104b9248eccc870de3af12 Mon Sep 17 00:00:00 2001 From: Lai Jiangshan Date: Wed, 6 Jul 2016 11:47:33 +0800 Subject: [PATCH] do not apply the container's env on exec let the hyperd do it. (merge the envs) Signed-off-by: Lai Jiangshan --- src/exec.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/exec.c b/src/exec.c index 5b0b595..96a6ce9 100644 --- a/src/exec.c +++ b/src/exec.c @@ -518,9 +518,8 @@ static int hyper_enter_container(struct hyper_pod *pod, /* TODO: wait for container finishing setup root */ chdir("/"); + ret = 0; - // TODO: let the hyperd do it (merging the env) when needed. - ret = hyper_setup_env(c->exec.envs, c->exec.envs_num); out: close(ipcns); close(utsns);