wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-27 00:11:17 +02:00
Code Activity

Merge branch 'fix-writable-shell' of https://github.com/yorickvP/nix

Browse source
This commit is contained in:
Eelco Dolstra 2021-11-08 21:12:51 +01:00
commit 7a71621b7c
4 changed files with 44 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

28
src/libutil/util.cc
View file

@ -1631,10 +1631,34 @@ void setStackSize(size_t stackSize)
}
#endif
}
static AutoCloseFD fdSavedMountNamespace;
void restoreProcessContext()
void saveMountNamespace()
{
#if __linux__
static std::once_flag done;
std::call_once(done, []() {
fdSavedMountNamespace = open("/proc/self/ns/mnt", O_RDONLY);
if (!fdSavedMountNamespace)
throw SysError("saving parent mount namespace");
});
#endif
}
void restoreMountNamespace()
{
#if __linux__
if (fdSavedMountNamespace && setns(fdSavedMountNamespace.get(), CLONE_NEWNS) == -1)
throw SysError("restoring parent mount namespace");
#endif
}
void restoreProcessContext(bool restoreMounts)
{
restoreSignals();
if (restoreMounts) {
restoreMountNamespace();
}
restoreAffinity();
@ -1774,7 +1798,7 @@ void commonChildInit(Pipe & logPipe)
logger = makeSimpleLogger();
const static string pathNullDevice = "/dev/null";
restoreProcessContext();
restoreProcessContext(false);
/* Put the child in a separate session (and thus a separate
process group) so that it has no controlling terminal (meaning