about summary refs log tree commit diff
path: root/src/libstore
diff options
context:
space:
mode:
authorEelco Dolstra <eelco.dolstra@logicblox.com>2014-08-04T15·07+0200
committerEelco Dolstra <eelco.dolstra@logicblox.com>2014-08-04T15·09+0200
commitbb45092f72d173a7754f7e4a6457d44c748a893b (patch)
tree747b4a365033dc1da3f2ebe6844a5cd0b7058b0c /src/libstore
parent7a60ff9a629f6d7c36ec710738a15e713acd6a34 (diff)
Make chroot builds easier to set up
By default, we now include /bin/sh as a bind-mount of bash.
Diffstat (limited to 'src/libstore')
-rw-r--r--src/libstore/globals.cc3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/libstore/globals.cc b/src/libstore/globals.cc
index e9fe0beca4ef..77f25005b85f 100644
--- a/src/libstore/globals.cc
+++ b/src/libstore/globals.cc
@@ -48,6 +48,9 @@ Settings::Settings()
     useSubstitutes = true;
     buildUsersGroup = getuid() == 0 ? "nixbld" : "";
     useChroot = false;
+#ifdef DEFAULT_CHROOT_DIRS
+    dirsInChroot = tokenizeString<StringSet>(DEFAULT_CHROOT_DIRS, ":");
+#endif
     useSshSubstituter = true;
     impersonateLinux26 = false;
     keepLog = true;