Skip to content
This repository was archived by the owner on Feb 8, 2021. It is now read-only.

Commit 2bff516

Browse files
authored
Merge pull request #256 from gao-feng/merge
remove merge container workdir/env to exec
2 parents 3c4448c + df48f2a commit 2bff516

File tree

1 file changed

+0
-13
lines changed

1 file changed

+0
-13
lines changed

src/exec.c

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -518,20 +518,7 @@ static int hyper_do_exec_cmd(struct hyper_exec *exec, int pipe, struct stdio_con
518518
else
519519
unsetenv("TERM");
520520

521-
if (exec->init == 0) {
522-
/* TODO: merge container env to exec env in hyperd */
523-
if (hyper_setup_env(c->exec.envs, c->exec.envs_num) < 0) {
524-
fprintf(stderr, "setup container envs for exec failed\n");
525-
goto out;
526-
}
527-
/* TODO: copy container workdir to exec workdir in hyperd */
528-
if (c->exec.workdir && chdir(c->exec.workdir) < 0) {
529-
perror("enter container workdir failed\n");
530-
goto out;
531-
}
532-
}
533521
hyper_exec_process(exec, io);
534-
535522
out:
536523
_exit(125);
537524
}

0 commit comments

Comments
 (0)