From 4eb9e20028c4e52c23ce6a53fe02cac87171fda6 Mon Sep 17 00:00:00 2001
From: Eelco Dolstra <edolstra@gmail.com>
Date: Mon, 20 Nov 2017 17:59:32 +0100
Subject: nix run: Fix accidental removal of /nix/store existence check

Parenthetical to #1686, we don't need to create a new root if we can
just bind-mount on top of the existing /nix/store.
---
 src/nix/run.cc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'src/nix/run.cc')

diff --git a/src/nix/run.cc b/src/nix/run.cc
index 11acbc3db673..66f416efcec1 100644
--- a/src/nix/run.cc
+++ b/src/nix/run.cc
@@ -184,7 +184,7 @@ void chrootHelper(int argc, char * * argv)
        but that doesn't work in a user namespace yet (Ubuntu has a
        patch for this:
        https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1478578). */
-    if (true /* !pathExists(storeDir) */) {
+    if (!pathExists(storeDir)) {
         // FIXME: Use overlayfs?
 
         Path tmpDir = createTempDir();
-- 
cgit 1.4.1