puck/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

* Add /dev/pts to the default nix.conf.

Browse source
This commit is contained in:
Eelco Dolstra 2008-11-11 14:59:20 +00:00
parent 2b7c839b4e
commit 4166b11a53
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
nix.conf.example
View file

@ -164,13 +164,13 @@
# (using `mount --bind' on Linux) some directories from the normal # (using `mount --bind' on Linux) some directories from the normal
# file system hierarchy inside the chroot. These are the Nix store, # file system hierarchy inside the chroot. These are the Nix store,
# the temporary build directory (usually /tmp/nix-<pid>-<number>) and # the temporary build directory (usually /tmp/nix-<pid>-<number>) and
# the directories listed here. The default is "/dev /proc". Files # the directories listed here. The default is "/dev /dev/pts /proc".
# in /dev (such as /dev/null) are needed by many builds, and some # Files in /dev (such as /dev/null) are needed by many builds, and
# files in /proc may also be needed occasionally. # some files in /proc may also be needed occasionally.
# #
# Example: # Example:
# build-use-chroot = /dev /proc /bin # build-use-chroot = /dev /proc /bin
#build-chroot-dirs = /dev /proc #build-chroot-dirs = /dev /dev/pts /proc
### Option `system' ### Option `system'

9
src/libstore/build.cc
View file

@ -1744,15 +1744,14 @@ void DerivationGoal::startBuilder()
autoDelChrootTmp = boost::shared_ptr<AutoDelete>(new AutoDelete(chrootTmpDir)); autoDelChrootTmp = boost::shared_ptr<AutoDelete>(new AutoDelete(chrootTmpDir));
/* Bind-mount a user-configurable set of directories from the /* 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; Paths defaultDirs;
defaultDirs.push_back("/dev"); 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("/dev/pts");
defaultDirs.push_back("/proc"); defaultDirs.push_back("/proc");
Paths dirsInChroot = querySetting("build-chroot-dirs", defaultDirs); Paths dirsInChroot = querySetting("build-chroot-dirs", defaultDirs);
dirsInChroot.push_front(nixStore); dirsInChroot.push_front(nixStore);