max/nix-super
1
0
Fork 0
mirror of https://github.com/privatevoid-net/nix-super.git synced 2024-11-14 18:26:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #11706 from ivan-tkatchev/fix-11704

Browse source 
nix shell/run: Use overlayfs
This commit is contained in:
Eelco Dolstra 2024-10-22 14:17:28 +02:00 committed by GitHub
commit eaae19403d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/nix/run.cc
View file

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