From 215505bb46503b083fd64dd9a65e7b79d6eadf21 Mon Sep 17 00:00:00 2001 From: Eelco Dolstra Date: Sat, 13 Jan 2007 17:54:01 +0000 Subject: [PATCH] * Removed chroot support. --- doc/manual/env-common.xml | 11 ----------- scripts/download-using-manifests.pl.in | 2 -- scripts/nix-prefetch-url.in | 3 --- src/libmain/shared.cc | 6 ------ 4 files changed, 22 deletions(-) diff --git a/doc/manual/env-common.xml b/doc/manual/env-common.xml index 75ce39f40..89ee78c76 100644 --- a/doc/manual/env-common.xml +++ b/doc/manual/env-common.xml @@ -10,17 +10,6 @@ -NIX_ROOT - - If NIX_ROOT is set, the Nix command - will on startup perform a chroot() 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). - - - - NIX_IGNORE_SYMLINK_STORE diff --git a/scripts/download-using-manifests.pl.in b/scripts/download-using-manifests.pl.in index c5400a901..2ef98e346 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 4c18899da..0f1c95c7e 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 f1a7db40d..ca0a6e401 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));