lix-project/lix
20
58
Fork 31
Code Issues 360 Code Review (Gerrit) Projects 3 Releases Wiki Activity

chrootHelper: Handle symlinks in the root directory

Browse source 
This is necessary on Ubuntu where /bin and /lib* are symlinks.
This commit is contained in:
Eelco Dolstra 2020-12-22 12:28:50 +01:00
parent 724b7f4fb6
commit 5373f4be3b
1 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/nix/run.cc
View file

@ -258,14 +258,16 @@ void chrootHelper(int argc, char * * argv)
for (auto entry : readDirectory("/")) { for (auto entry : readDirectory("/")) {
auto src = "/" + entry.name; 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) auto st = lstat(src);
throw SysError("creating directory '%s'", dst); if (S_ISDIR(st.st_mode)) {
if (mount(src.c_str(), dst.c_str(), "", MS_BIND | MS_REC, 0) == -1) if (mkdir(dst.c_str(), 0700) == -1)
throw SysError("mounting '%s' on '%s'", src, dst); throw SysError("creating directory '%s'", dst);
if (mount(src.c_str(), dst.c_str(), "", MS_BIND | MS_REC, 0) == -1)
throw SysError("mounting '%s' on '%s'", src, dst);
} else if (S_ISLNK(st.st_mode))
createSymlink(readLink(src), dst);
} }
char * cwd = getcwd(0, 0); char * cwd = getcwd(0, 0);