JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chrootenv: error on chrootenv-inside-chrootenv, resolves #32802

Browse Source
This commit is contained in:
Yegor Timoshenko 2017-12-20 19:32:17 +00:00
parent 0234cd41b4
commit 710662be94
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkgs/build-support/build-fhs-userenv/chrootenv.c
View File

@ -155,7 +155,9 @@ int nftw_rm(const char *path, const struct stat *sb, int type,
#define REQUIREMENTS "Linux version >= 3.19 built with CONFIG_USER_NS option" #define REQUIREMENTS "Linux version >= 3.19 built with CONFIG_USER_NS option"
int main(int argc, char *argv[], char *envp[]) { extern char **environ;
int main(int argc, char *argv[]) {
if (argc < 2) { if (argc < 2) {
fprintf(stderr, "Usage: %s command [arguments...]\n" fprintf(stderr, "Usage: %s command [arguments...]\n"
"Requires " REQUIREMENTS ".\n", "Requires " REQUIREMENTS ".\n",
@ -163,6 +165,12 @@ int main(int argc, char *argv[], char *envp[]) {
exit(EX_USAGE); exit(EX_USAGE);
} }
if (getenv("NIX_CHROOTENV") != NULL)
errorf(EX_USAGE, "can't create chrootenv inside chrootenv");
if (setenv("NIX_CHROOTENV", "1", false) < 0)
errorf(EX_IOERR, "setenv");
char tmpl[] = "/tmp/chrootenvXXXXXX"; char tmpl[] = "/tmp/chrootenvXXXXXX";
char *root = mkdtemp(tmpl); char *root = mkdtemp(tmpl);
@ -222,7 +230,7 @@ int main(int argc, char *argv[], char *envp[]) {
argv++; argv++;
if (execvpe(*argv, argv, env_filter(envp)) < 0) if (execvpe(*argv, argv, env_filter(environ)) < 0)
errorf(EX_OSERR, "execvpe"); errorf(EX_OSERR, "execvpe");
} }