nrabulinski/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests Activity

Merge pull request #5519 from edolstra/move-unshare

Browse source 
Unshare mount namespace in main()
This commit is contained in:
Eelco Dolstra 2021-11-09 12:33:25 +01:00 committed by GitHub
parent 25d2316e8f ff2af4d64e
commit 884ef336c4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/libmain/progress-bar.cc
View file

@ -103,17 +103,19 @@ public:
~ProgressBar()
{
stop();
updateThread.join();
}
void stop() override
{
auto state(state_.lock());
if (!state->active) return;
state->active = false;
writeToStderr("\r\e[K");
updateCV.notify_one();
quitCV.notify_one();
{
auto state(state_.lock());
if (!state->active) return;
state->active = false;
writeToStderr("\r\e[K");
updateCV.notify_one();
quitCV.notify_one();
}
updateThread.join();
}
bool isVerbose() override {

4
src/libstore/local-store.cc
View file

@ -504,10 +504,6 @@ 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");
if (mount(0, realStoreDir.get().c_str(), "none", MS_REMOUNT | MS_BIND, 0) == -1)
throw SysError("remounting %1% writable", realStoreDir);
}

8
src/nix/main.cc
View file

@ -255,6 +255,14 @@ void mainWrapped(int argc, char * * argv)
initNix();
initGC();
#if __linux__
if (getuid() == 0) {
saveMountNamespace();
if (unshare(CLONE_NEWNS) == -1)
throw SysError("setting up a private mount namespace");
}
#endif
programPath = argv[0];
auto programName = std::string(baseNameOf(programPath));