max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-22 05:56:15 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #10758 from obsidiansystems/fix-10747

Browse source 
Fix #10747
This commit is contained in:
John Ericson 2024-05-22 16:59:39 -04:00 committed by GitHub
commit 859e55d1e8
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 13 additions and 6 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 {
tryUnshareFilesystem();
} catch (nix::Error & e) {
e.addTrace({}, "in download thread");
throw;
}
#endif
std::map<CURL *, std::shared_ptr<TransferItem>> items;

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

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

6
src/libutil/linux/namespaces.hh
View file

@ -20,11 +20,13 @@ void saveMountNamespace();
void restoreMountNamespace();
/**
* Cause this thread to not share any FS attributes with the main
* Cause this thread to try to not share any FS attributes with the main
* thread, because this causes setns() in restoreMountNamespace() to
* fail.
*
* This is best effort -- EPERM and ENOSYS failures are just ignored.
*/
void unshareFilesystem();
void tryUnshareFilesystem();
bool userNamespacesSupported();