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

* Removed chroot support.

Browse source
This commit is contained in:
Eelco Dolstra 2007-01-13 17:54:01 +00:00
parent f23dcdd603
commit 215505bb46
4 changed files with 0 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
doc/manual/env-common.xml
View file

@ -10,17 +10,6 @@
<variablelist> <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> <varlistentry><term><envar>NIX_IGNORE_SYMLINK_STORE</envar></term>
<listitem> <listitem>

2
scripts/download-using-manifests.pl.in
View file

@ -10,8 +10,6 @@ my $logFile = "@localstatedir@/log/nix/downloads";
open LOGFILE, ">>$logFile" or die "cannot open log file $logFile"; open LOGFILE, ">>$logFile" or die "cannot open log file $logFile";
delete $ENV{"NIX_ROOT"};
# Create a temporary directory. # Create a temporary directory.
my $tmpDir = tempdir("nix-download.XXXXXX", CLEANUP => 1, TMPDIR => 1) my $tmpDir = tempdir("nix-download.XXXXXX", CLEANUP => 1, TMPDIR => 1)
or die "cannot create a temporary directory"; or die "cannot create a temporary directory";

3
scripts/nix-prefetch-url.in
View file

@ -3,9 +3,6 @@
url=$1 url=$1
expHash=$2 expHash=$2
# to prevent doing more than 1 chroot
unset NIX_ROOT
# needed to make it work on NixOS # needed to make it work on NixOS
export PATH=$PATH:@coreutils@ export PATH=$PATH:@coreutils@

6
src/libmain/shared.cc
View file

@ -85,12 +85,6 @@ void initDerivationsHelpers();
processor. */ processor. */
static void initAndRun(int argc, char * * argv) 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. */ /* Setup Nix paths. */
nixStore = canonPath(getEnv("NIX_STORE_DIR", getEnv("NIX_STORE", NIX_STORE_DIR))); nixStore = canonPath(getEnv("NIX_STORE_DIR", getEnv("NIX_STORE", NIX_STORE_DIR)));
nixDataDir = canonPath(getEnv("NIX_DATA_DIR", NIX_DATA_DIR)); nixDataDir = canonPath(getEnv("NIX_DATA_DIR", NIX_DATA_DIR));