maurice/snix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

nix run: Ignore non-directories while setting up the chroot

Browse source 
Fixes #1686.
This commit is contained in:
Eelco Dolstra 2017-11-20 17:58:23 +01:00
parent 193330d321
commit a3aa850f0f
No known key found for this signature in database
GPG key ID: 8170B4726D7198DE
1 changed files with 6 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
src/nix/run.cc
View file

@ -195,12 +195,15 @@ void chrootHelper(int argc, char * * argv)
throw SysError("mounting '%s' on '%s'", realStoreDir, storeDir); throw SysError("mounting '%s' on '%s'", realStoreDir, storeDir);
for (auto entry : readDirectory("/")) { for (auto entry : readDirectory("/")) {
auto src = "/" + entry.name;
auto st = lstat(src);
if (!S_ISDIR(st.st_mode)) continue;
Path dst = tmpDir + "/" + entry.name; Path dst = tmpDir + "/" + entry.name;
if (pathExists(dst)) continue; if (pathExists(dst)) continue;
if (mkdir(dst.c_str(), 0700) == -1) if (mkdir(dst.c_str(), 0700) == -1)
throw SysError(format("creating directory '%s'") % dst); throw SysError("creating directory '%s'", dst);
if (mount(("/" + entry.name).c_str(), dst.c_str(), "", MS_BIND | MS_REC, 0) == -1) if (mount(src.c_str(), dst.c_str(), "", MS_BIND | MS_REC, 0) == -1)
throw SysError(format("mounting '%s' on '%s'") % ("/" + entry.name) % dst); throw SysError("mounting '%s' on '%s'", src, dst);
} }
char * cwd = getcwd(0, 0); char * cwd = getcwd(0, 0);