diff options
author | Eelco Dolstra <edolstra@gmail.com> | 2019-02-05T09·49+0100 |
---|---|---|
committer | Eelco Dolstra <edolstra@gmail.com> | 2019-02-05T09·49+0100 |
commit | 01d07b1e92c298f729a73705907b2987da9a4d0c (patch) | |
tree | a58d0e6ad9d7b1586346cb1f155d9b79aa15bb4d /src/libutil/util.hh | |
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/libutil/util.hh')
-rw-r--r-- | src/libutil/util.hh | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/src/libutil/util.hh b/src/libutil/util.hh index d67bddc138c8..bda87bee433e 100644 --- a/src/libutil/util.hh +++ b/src/libutil/util.hh @@ -250,7 +250,6 @@ struct ProcessOptions bool dieWithParent = true; bool runExitHandlers = false; bool allowVfork = true; - bool restoreMountNamespace = true; }; pid_t startProcess(std::function<void()> fun, const ProcessOptions & options = ProcessOptions()); @@ -515,13 +514,4 @@ typedef std::function<bool(const Path & path)> PathFilter; extern PathFilter defaultPathFilter; -/* Save the current mount namespace. Ignored if called more than - once. */ -void saveMountNamespace(); - -/* Restore the mount namespace saved by saveMountNamespace(). Ignored - if saveMountNamespace() was never called. */ -void restoreMountNamespace(); - - } |