nordic-dev.net/nix
nordic-dev.net/nix
2
0
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2024-11-22 06:42:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

unshareFilesystem: Do not assume caller

Browse Source
This commit is contained in:
John Ericson 2024-05-22 16:04:14 -04:00
parent bd7a074636
commit d5fdfdc592
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/libstore/filetransfer.cc
View File

@ -580,7 +580,12 @@ struct curlFileTransfer : public FileTransfer
#endif
#if __linux__
unshareFilesystem();
try {
unshareFilesystem();
} catch (nix::Error & e) {
e.addTrace({}, "in download thread");
throw;
}
#endif
std::map<CURL *, std::shared_ptr<TransferItem>> items;

2
src/libutil/linux/namespaces.cc
View File

@ -140,7 +140,7 @@ void restoreMountNamespace()
void unshareFilesystem()
{
if (unshare(CLONE_FS) != 0 && errno != EPERM)
throw SysError("unsharing filesystem state in download thread");
throw SysError("unsharing filesystem state");
}
}