max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2025-02-16 23:27:17 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

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 #endif
#if __linux__ #if __linux__
unshareFilesystem(); try {
unshareFilesystem();
} catch (nix::Error & e) {
e.addTrace({}, "in download thread");
throw;
}
#endif #endif
std::map<CURL *, std::shared_ptr<TransferItem>> items; std::map<CURL *, std::shared_ptr<TransferItem>> items;

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

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