diff options
| -rw-r--r-- | src/libstore/build.cc | 15 | ||||
| -rw-r--r-- | src/libstore/globals.cc | 1 |
2 files changed, 14 insertions, 2 deletions
diff --git a/src/libstore/build.cc b/src/libstore/build.cc index 7a78d55570b2..973e7a122f5f 100644 --- a/src/libstore/build.cc +++ b/src/libstore/build.cc @@ -2017,11 +2017,11 @@ void DerivationGoal::initChild() bind-mount the host /dev. */ if (dirsInChroot.find("/dev") == dirsInChroot.end()) { createDirs(chrootRootDir + "/dev/shm"); + createDirs(chrootRootDir + "/dev/pts"); Strings ss; ss.push_back("/dev/full"); ss.push_back("/dev/kvm"); ss.push_back("/dev/null"); - ss.push_back("/dev/ptmx"); ss.push_back("/dev/random"); ss.push_back("/dev/tty"); ss.push_back("/dev/urandom"); @@ -2065,6 +2065,19 @@ void DerivationGoal::initChild() if (pathExists("/dev/shm") && mount("none", (chrootRootDir + "/dev/shm").c_str(), "tmpfs", 0, 0) == -1) throw SysError("mounting /dev/shm"); + /* Mount a new devpts on /dev/pts. Note that this + requires the kernel to be compiled with + CONFIG_DEVPTS_MULTIPLE_INSTANCES=y (which is the case + if /dev/ptx/ptmx exists). */ + if (pathExists("/dev/pts/ptmx") && + !pathExists(chrootRootDir + "/dev/ptmx") + && dirsInChroot.find("/dev/pts") == dirsInChroot.end()) + { + if (mount("none", (chrootRootDir + "/dev/pts").c_str(), "devpts", 0, "newinstance,mode=0620") == -1) + throw SysError("mounting /dev/pts"); + createSymlink("/dev/pts/ptmx", chrootRootDir + "/dev/ptmx"); + } + /* Do the chroot(). Below we do a chdir() to the temporary build directory to make sure the current directory is in the chroot. (Actually the order diff --git a/src/libstore/globals.cc b/src/libstore/globals.cc index af2fdfd57ace..86fa56739c5d 100644 --- a/src/libstore/globals.cc +++ b/src/libstore/globals.cc @@ -42,7 +42,6 @@ Settings::Settings() useSubstitutes = true; useChroot = false; useSshSubstituter = false; - dirsInChroot.insert("/dev/pts"); impersonateLinux26 = false; keepLog = true; compressLog = true; |