diff options
Diffstat (limited to 'src/libstore')
| -rw-r--r-- | src/libstore/filetransfer.cc | 8 | ||||
| -rw-r--r-- | src/libstore/local-store.cc | 1 |
2 files changed, 9 insertions, 0 deletions
diff --git a/src/libstore/filetransfer.cc b/src/libstore/filetransfer.cc index 37e17b397..4621a8217 100644 --- a/src/libstore/filetransfer.cc +++ b/src/libstore/filetransfer.cc @@ -544,6 +544,14 @@ struct curlFileTransfer : public FileTransfer stopWorkerThread(); }); +#ifdef __linux__ + /* Cause this thread to not share any FS attributes with the main thread, + because this causes setns() in restoreMountNamespace() to fail. + Ideally, this would happen in the std::thread() constructor. */ + if (unshare(CLONE_FS) != 0) + throw SysError("unsharing filesystem state in download thread"); +#endif + std::map<CURL *, std::shared_ptr<TransferItem>> items; bool quit = false; diff --git a/src/libstore/local-store.cc b/src/libstore/local-store.cc index 225a19e1e..1cef50a40 100644 --- a/src/libstore/local-store.cc +++ b/src/libstore/local-store.cc @@ -504,6 +504,7 @@ void LocalStore::makeStoreWritable() throw SysError("getting info about the Nix store mount point"); if (stat.f_flag & ST_RDONLY) { + saveMountNamespace(); if (unshare(CLONE_NEWNS) == -1) throw SysError("setting up a private mount namespace"); |