mirror of
https://github.com/NixOS/nix.git
synced 2024-10-29 21:30:51 +00:00
This commit is contained in:
parent
806a91f7bf
commit
e33d6f24e3
@ -167,10 +167,9 @@ void chrootHelper(int argc, char * * argv)
|
||||
/* Bind-mount realStoreDir on /nix/store. If the latter mount
|
||||
point doesn't already exists, we have to create a chroot
|
||||
environment containing the mount point and bind mounts for the
|
||||
children of /. Would be nice if we could use overlayfs here,
|
||||
but that doesn't work in a user namespace yet (Ubuntu has a
|
||||
patch for this:
|
||||
https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1478578). */
|
||||
children of /.
|
||||
Overlayfs for user namespaces is fixed in Linux since ac519625ed
|
||||
(v5.11, 14 February 2021) */
|
||||
if (!pathExists(storeDir)) {
|
||||
// FIXME: Use overlayfs?
|
||||
|
||||
@ -206,6 +205,7 @@ void chrootHelper(int argc, char * * argv)
|
||||
if (chdir(cwd) == -1)
|
||||
throw SysError("chdir to '%s' in chroot", cwd);
|
||||
} else
|
||||
if (mount("overlay", storeDir.c_str(), "overlay", MS_MGC_VAL, fmt("lowerdir=%s:%s", storeDir, realStoreDir).c_str()) == -1)
|
||||
if (mount(realStoreDir.c_str(), storeDir.c_str(), "", MS_BIND, 0) == -1)
|
||||
throw SysError("mounting '%s' on '%s'", realStoreDir, storeDir);
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user