diff options
| author | Eelco Dolstra <e.dolstra@tudelft.nl> | 2007-01-13T17·54+0000 |
|---|---|---|
| committer | Eelco Dolstra <e.dolstra@tudelft.nl> | 2007-01-13T17·54+0000 |
| commit | 215505bb46503b083fd64dd9a65e7b79d6eadf21 (patch) | |
| tree | 022a0fa8297bdd263033eff83b95c4d5cf84ff7e | |
| parent | f23dcdd60330c3b2f83b5b4278e38c245c397468 (diff) | |
* Removed chroot support.
| -rw-r--r-- | doc/manual/env-common.xml | 11 | ||||
| -rw-r--r-- | scripts/download-using-manifests.pl.in | 2 | ||||
| -rw-r--r-- | scripts/nix-prefetch-url.in | 3 | ||||
| -rw-r--r-- | src/libmain/shared.cc | 6 |
4 files changed, 0 insertions, 22 deletions
diff --git a/doc/manual/env-common.xml b/doc/manual/env-common.xml index 75ce39f406..89ee78c768 100644 --- a/doc/manual/env-common.xml +++ b/doc/manual/env-common.xml @@ -10,17 +10,6 @@ <variablelist> -<varlistentry><term><envar>NIX_ROOT</envar></term> - - <listitem><para>If <envar>NIX_ROOT</envar> is set, the Nix command - will on startup perform a <function>chroot()</function> to the - specified directory. This is useful in certain bootstrapping - situations (e.g., when installing a Nix installation onto a hard - disk from CD-ROM).</para></listitem> - -</varlistentry> - - <varlistentry><term><envar>NIX_IGNORE_SYMLINK_STORE</envar></term> <listitem> diff --git a/scripts/download-using-manifests.pl.in b/scripts/download-using-manifests.pl.in index c5400a901a..2ef98e3466 100644 --- a/scripts/download-using-manifests.pl.in +++ b/scripts/download-using-manifests.pl.in @@ -10,8 +10,6 @@ my $logFile = "@localstatedir@/log/nix/downloads"; open LOGFILE, ">>$logFile" or die "cannot open log file $logFile"; -delete $ENV{"NIX_ROOT"}; - # Create a temporary directory. my $tmpDir = tempdir("nix-download.XXXXXX", CLEANUP => 1, TMPDIR => 1) or die "cannot create a temporary directory"; diff --git a/scripts/nix-prefetch-url.in b/scripts/nix-prefetch-url.in index 4c18899da7..0f1c95c7e8 100644 --- a/scripts/nix-prefetch-url.in +++ b/scripts/nix-prefetch-url.in @@ -3,9 +3,6 @@ url=$1 expHash=$2 -# to prevent doing more than 1 chroot -unset NIX_ROOT - # needed to make it work on NixOS export PATH=$PATH:@coreutils@ diff --git a/src/libmain/shared.cc b/src/libmain/shared.cc index f1a7db40dc..ca0a6e4010 100644 --- a/src/libmain/shared.cc +++ b/src/libmain/shared.cc @@ -85,12 +85,6 @@ void initDerivationsHelpers(); processor. */ static void initAndRun(int argc, char * * argv) { - string root = getEnv("NIX_ROOT"); - if (root != "") { - if (chroot(root.c_str()) != 0) - throw SysError(format("changing root to `%1%'") % root); - } - /* Setup Nix paths. */ nixStore = canonPath(getEnv("NIX_STORE_DIR", getEnv("NIX_STORE", NIX_STORE_DIR))); nixDataDir = canonPath(getEnv("NIX_DATA_DIR", NIX_DATA_DIR)); |