diff options
author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2008-11-11T14·59+0000 |
---|---|---|
committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2008-11-11T14·59+0000 |
commit | 4166b11a53f16365f9becfa4f29f15047fc221af (patch) | |
tree | 252057aff37b5f8132cddf4a92b71ec43eea3697 /src | |
parent | 2b7c839b4e20d53e097036d854fbd52dbbc16dd6 (diff) |
* Add /dev/pts to the default nix.conf.
Diffstat (limited to 'src')
-rw-r--r-- | src/libstore/build.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/src/libstore/build.cc b/src/libstore/build.cc index 586e44922197..3cd281fc839f 100644 --- a/src/libstore/build.cc +++ b/src/libstore/build.cc @@ -1744,15 +1744,14 @@ void DerivationGoal::startBuilder() autoDelChrootTmp = boost::shared_ptr<AutoDelete>(new AutoDelete(chrootTmpDir)); /* Bind-mount a user-configurable set of directories from the - host file system. */ + host file system. The `/dev/pts' directory must be mounted + separately so that newly-created pseudo-terminals show + up. */ Paths defaultDirs; defaultDirs.push_back("/dev"); - - /* The `/dev/pts' directory must be mounted separately so that - newly-created pseudo-terminals show up. */ defaultDirs.push_back("/dev/pts"); - defaultDirs.push_back("/proc"); + Paths dirsInChroot = querySetting("build-chroot-dirs", defaultDirs); dirsInChroot.push_front(nixStore); |