max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-22 22:16:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

* Revert r13150: now that we use private namespaces for the chroot, we

Browse source 
don't have to put the chroot in /nix/var/nix/chroots anymore.
  They're back in /tmp now.
This commit is contained in:
Eelco Dolstra 2008-12-11 17:52:34 +00:00
parent 5a569509b4
commit 652817046b
4 changed files with 1 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
src/libmain/shared.cc
View file

@ -138,7 +138,6 @@ static void initAndRun(int argc, char * * argv)
nixConfDir = canonPath(getEnv("NIX_CONF_DIR", NIX_CONF_DIR)); nixConfDir = canonPath(getEnv("NIX_CONF_DIR", NIX_CONF_DIR));
nixLibexecDir = canonPath(getEnv("NIX_LIBEXEC_DIR", NIX_LIBEXEC_DIR)); nixLibexecDir = canonPath(getEnv("NIX_LIBEXEC_DIR", NIX_LIBEXEC_DIR));
nixBinDir = canonPath(getEnv("NIX_BIN_DIR", NIX_BIN_DIR)); nixBinDir = canonPath(getEnv("NIX_BIN_DIR", NIX_BIN_DIR));
nixChrootsDir = canonPath(getEnv("NIX_CHROOTS_DIR", nixStateDir + "/chroots"));
string subs = getEnv("NIX_SUBSTITUTERS", "default"); string subs = getEnv("NIX_SUBSTITUTERS", "default");
if (subs == "default") { if (subs == "default") {

2
src/libstore/build.cc
View file

@ -1657,7 +1657,7 @@ void DerivationGoal::startBuilder()
#if CHROOT_ENABLED #if CHROOT_ENABLED
/* Create a temporary directory in which we set up the chroot /* Create a temporary directory in which we set up the chroot
environment using bind-mounts. */ environment using bind-mounts. */
chrootRootDir = createTempDir(nixChrootsDir, "chroot-nix"); chrootRootDir = createTempDir("", "nix-chroot");
/* Clean up the chroot directory automatically. */ /* Clean up the chroot directory automatically. */
autoDelChroot = boost::shared_ptr<AutoDelete>(new AutoDelete(chrootRootDir)); autoDelChroot = boost::shared_ptr<AutoDelete>(new AutoDelete(chrootRootDir));

1
src/libstore/globals.cc
View file

@ -16,7 +16,6 @@ string nixDBPath = "/UNINIT";
string nixConfDir = "/UNINIT"; string nixConfDir = "/UNINIT";
string nixLibexecDir = "/UNINIT"; string nixLibexecDir = "/UNINIT";
string nixBinDir = "/UNINIT"; string nixBinDir = "/UNINIT";
string nixChrootsDir = "/UNINIT";
bool keepFailed = false; bool keepFailed = false;
bool keepGoing = false; bool keepGoing = false;

6
src/libstore/globals.hh
View file

@ -35,12 +35,6 @@ extern string nixLibexecDir;
/* nixBinDir is the directory where the main programs are stored. */ /* nixBinDir is the directory where the main programs are stored. */
extern string nixBinDir; extern string nixBinDir;
/* nixChrootsDir is the directory where we create chroot environments
(when chroot builds are enabled). We don't put these under /tmp to
prevent "rm -rf /tmp" from recursing into /nix/store via the bind
mounts in the chroots. */
extern string nixChrootsDir;
/* Misc. global flags. */ /* Misc. global flags. */