diff options
| author | Eelco Dolstra <edolstra@gmail.com> | 2019-02-05 10:49:19 +0100 |
|---|---|---|
| committer | Eelco Dolstra <edolstra@gmail.com> | 2019-02-05 10:49:19 +0100 |
| commit | 01d07b1e92c298f729a73705907b2987da9a4d0c (patch) | |
| tree | a58d0e6ad9d7b1586346cb1f155d9b79aa15bb4d /src/nix/run.cc | |
| parent | 92d08c02c84be34ec0df56ed718526c382845d1a (diff) | |
Revert "Restore parent mount namespace before executing a child process"
This reverts commit a0ef21262f4d5652bfb65cfacaec01d89c475a93. This
doesn't work in 'nix run' and nix-shell because setns() fails in
multithreaded programs, and Boehm GC mark threads are uncancellable.
Fixes #2646.
Diffstat (limited to 'src/nix/run.cc')
| -rw-r--r-- | src/nix/run.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/nix/run.cc b/src/nix/run.cc index 129707298..35b763345 100644 --- a/src/nix/run.cc +++ b/src/nix/run.cc @@ -153,9 +153,9 @@ struct CmdRun : InstallablesCommand stopProgressBar(); - restoreAffinity(); restoreSignals(); - restoreMountNamespace(); + + restoreAffinity(); /* If this is a diverted store (i.e. its "logical" location (typically /nix/store) differs from its "physical" location |