diff options
author | Armijn Hemel <armijn@gpl-violations.org> | 2006-08-05T00·31+0000 |
---|---|---|
committer | Armijn Hemel <armijn@gpl-violations.org> | 2006-08-05T00·31+0000 |
commit | f1947cce9375745b63f7f0512fd1bd4a0f5c1639 (patch) | |
tree | 7ae39d529407990e4acd67d698860a5a3e140025 | |
parent | 1854f84e830a5282ae1ad1d0c85ed641af6bcf33 (diff) |
prevent doing recursive chroots, by unsetting NIX_ROOT in the scripts.
-rw-r--r-- | scripts/download-using-manifests.pl.in | 1 | ||||
-rw-r--r-- | scripts/nix-prefetch-url.in | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/scripts/download-using-manifests.pl.in b/scripts/download-using-manifests.pl.in index 7514525261aa..382eb7c3ae4d 100644 --- a/scripts/download-using-manifests.pl.in +++ b/scripts/download-using-manifests.pl.in @@ -9,6 +9,7 @@ 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; diff --git a/scripts/nix-prefetch-url.in b/scripts/nix-prefetch-url.in index 5f6ea4c0d37a..7d0a17163161 100644 --- a/scripts/nix-prefetch-url.in +++ b/scripts/nix-prefetch-url.in @@ -3,6 +3,9 @@ url=$1 expHash=$2 +# to prevent doing more than 1 chroot +unset NIX_ROOT + hashType=$NIX_HASH_ALGO if test -z "$hashType"; then hashType=md5 |