nixos/nix
1
1
Fork 0
mirror of https://github.com/NixOS/nix.git synced 2025-11-14 06:22:42 +01:00
Code Activity

Unshare mount namespace in main()

Browse source 
Doing it as a side-effect of calling LocalStore::makeStoreWritable()
is very ugly.

Also, make sure that stopping the progress bar joins the update
thread, otherwise that thread should be unshared as well.
This commit is contained in:
Eelco Dolstra 2021-11-08 22:00:45 +01:00
parent 7a71621b7c
commit ff2af4d64e
3 changed files with 17 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

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);
}