mirror of
https://github.com/privatevoid-net/nix-super.git
synced 2024-11-24 23:06:16 +02:00
Merge pull request #11706 from ivan-tkatchev/fix-11704
nix shell/run: Use overlayfs
This commit is contained in:
commit
eaae19403d
1 changed files with 6 additions and 6 deletions
|
@ -167,10 +167,9 @@ void chrootHelper(int argc, char * * argv)
|
||||||
/* Bind-mount realStoreDir on /nix/store. If the latter mount
|
/* Bind-mount realStoreDir on /nix/store. If the latter mount
|
||||||
point doesn't already exists, we have to create a chroot
|
point doesn't already exists, we have to create a chroot
|
||||||
environment containing the mount point and bind mounts for the
|
environment containing the mount point and bind mounts for the
|
||||||
children of /. Would be nice if we could use overlayfs here,
|
children of /.
|
||||||
but that doesn't work in a user namespace yet (Ubuntu has a
|
Overlayfs for user namespaces is fixed in Linux since ac519625ed
|
||||||
patch for this:
|
(v5.11, 14 February 2021) */
|
||||||
https://bugs.launchpad.net/ubuntu/+source/linux/+bug/1478578). */
|
|
||||||
if (!pathExists(storeDir)) {
|
if (!pathExists(storeDir)) {
|
||||||
// FIXME: Use overlayfs?
|
// FIXME: Use overlayfs?
|
||||||
|
|
||||||
|
@ -206,8 +205,9 @@ void chrootHelper(int argc, char * * argv)
|
||||||
if (chdir(cwd) == -1)
|
if (chdir(cwd) == -1)
|
||||||
throw SysError("chdir to '%s' in chroot", cwd);
|
throw SysError("chdir to '%s' in chroot", cwd);
|
||||||
} else
|
} else
|
||||||
if (mount(realStoreDir.c_str(), storeDir.c_str(), "", MS_BIND, 0) == -1)
|
if (mount("overlay", storeDir.c_str(), "overlay", MS_MGC_VAL, fmt("lowerdir=%s:%s", storeDir, realStoreDir).c_str()) == -1)
|
||||||
throw SysError("mounting '%s' on '%s'", realStoreDir, storeDir);
|
if (mount(realStoreDir.c_str(), storeDir.c_str(), "", MS_BIND, 0) == -1)
|
||||||
|
throw SysError("mounting '%s' on '%s'", realStoreDir, storeDir);
|
||||||
|
|
||||||
writeFile(fs::path{"/proc/self/setgroups"}, "deny");
|
writeFile(fs::path{"/proc/self/setgroups"}, "deny");
|
||||||
writeFile(fs::path{"/proc/self/uid_map"}, fmt("%d %d %d", uid, uid, 1));
|
writeFile(fs::path{"/proc/self/uid_map"}, fmt("%d %d %d", uid, uid, 1));
|
||||||
|
|
Loading…
Reference in a new issue