diff options
| author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-06-27 09:52:27 -0400 |
|---|---|---|
| committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2012-06-27 09:52:27 -0400 |
| commit | 42f5a2fc297f841d982f07062c653b27557a3cd5 (patch) | |
| tree | df9c26478af7db3fb567f836b70a836ce6bafc29 /src/libstore | |
| parent | 3ee208516fbdd302b178d68a20dd44517a276a96 (diff) | |
Mount an empty /dev/shm tmpfs in the chroot
This ensures that whatever the builder writes in /dev/shm is
automatically cleaned up.
Diffstat (limited to 'src/libstore')
| -rw-r--r-- | src/libstore/build.cc | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/libstore/build.cc b/src/libstore/build.cc index e7a8ee434..246e0d9da 100644 --- a/src/libstore/build.cc +++ b/src/libstore/build.cc @@ -1868,6 +1868,12 @@ void DerivationGoal::initChild() private PID namespace. */ if (mount("none", (chrootRootDir + "/proc").c_str(), "proc", 0, 0) == -1) throw SysError("mounting /proc"); + + /* Mount a new tmpfs on /dev/shm to ensure that whatever + the builder puts in /dev/shm is cleaned up automatically. */ + if (pathExists("/dev/shm")) + if (mount("none", (chrootRootDir + "/dev/shm").c_str(), "tmpfs", 0, 0) == -1) + throw SysError("mounting /dev/shm"); /* Do the chroot(). Below we do a chdir() to the temporary build directory to make sure the current |