wroclaw-git-backups/nix
1
0
Fork 0
mirror of https://github.com/NixOS/nix synced 2025-06-25 02:21:16 +02:00
Code Activity

Move doBind()

Browse source
This commit is contained in:
Eelco Dolstra 2025-05-26 21:36:13 +02:00
parent 9f8f3968e3
commit b623fe8d14
2 changed files with 50 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

47
src/libstore/unix/build/derivation-builder.cc
View file

@ -32,24 +32,13 @@
# include <sys/statvfs.h> # include <sys/statvfs.h>
#endif #endif
/* Includes required for chroot support. */
#ifdef __linux__ #ifdef __linux__
# include "linux/fchmodat2-compat.hh" # include "linux/fchmodat2-compat.hh"
# include <sys/ioctl.h>
# include <net/if.h>
# include <netinet/ip.h>
# include <sys/mman.h>
# include <sched.h>
# include <sys/param.h>
# include <sys/mount.h>
# include <sys/syscall.h> # include <sys/syscall.h>
# include "nix/util/namespaces.hh"
# if HAVE_SECCOMP # if HAVE_SECCOMP
# include <seccomp.h> # include <seccomp.h>
# endif # endif
# define pivot_root(new_root, put_old) (syscall(SYS_pivot_root, new_root, put_old))
# include "nix/util/cgroup.hh" # include "nix/util/cgroup.hh"
# include "nix/store/personality.hh"
#endif #endif
#include <pwd.h> #include <pwd.h>
@ -683,42 +672,6 @@ bool DerivationBuilderImpl::decideWhetherDiskFull()
return diskFull; return diskFull;
} }
#ifdef __linux__
static void doBind(const Path & source, const Path & target, bool optional = false) {
debug("bind mounting '%1%' to '%2%'", source, target);
auto bindMount = [&]() {
if (mount(source.c_str(), target.c_str(), "", MS_BIND | MS_REC, 0) == -1)
throw SysError("bind mount from '%1%' to '%2%' failed", source, target);
};
auto maybeSt = maybeLstat(source);
if (!maybeSt) {
if (optional)
return;
else
throw SysError("getting attributes of path '%1%'", source);
}
auto st = *maybeSt;
if (S_ISDIR(st.st_mode)) {
createDirs(target);
bindMount();
} else if (S_ISLNK(st.st_mode)) {
// Symlinks can (apparently) not be bind-mounted, so just copy it
createDirs(dirOf(target));
copyFile(
std::filesystem::path(source),
std::filesystem::path(target), false);
} else {
createDirs(dirOf(target));
writeFile(target, "");
bindMount();
}
};
#endif
/** /**
* Rethrow the current exception as a subclass of `Error`. * Rethrow the current exception as a subclass of `Error`.
*/ */

50
src/libstore/unix/build/linux-derivation-builder.cc
View file

@ -1,7 +1,57 @@
#ifdef __linux__ #ifdef __linux__
# ifdef __linux__
# include <sys/ioctl.h>
# include <net/if.h>
# include <netinet/ip.h>
# include <sys/mman.h>
# include <sched.h>
# include <sys/param.h>
# include <sys/mount.h>
# include <sys/syscall.h>
# include "nix/util/namespaces.hh"
# if HAVE_SECCOMP
# include <seccomp.h>
# endif
# define pivot_root(new_root, put_old) (syscall(SYS_pivot_root, new_root, put_old))
# include "nix/util/cgroup.hh"
# include "nix/store/personality.hh"
# endif
namespace nix { namespace nix {
static void doBind(const Path & source, const Path & target, bool optional = false)
{
debug("bind mounting '%1%' to '%2%'", source, target);
auto bindMount = [&]() {
if (mount(source.c_str(), target.c_str(), "", MS_BIND | MS_REC, 0) == -1)
throw SysError("bind mount from '%1%' to '%2%' failed", source, target);
};
auto maybeSt = maybeLstat(source);
if (!maybeSt) {
if (optional)
return;
else
throw SysError("getting attributes of path '%1%'", source);
}
auto st = *maybeSt;
if (S_ISDIR(st.st_mode)) {
createDirs(target);
bindMount();
} else if (S_ISLNK(st.st_mode)) {
// Symlinks can (apparently) not be bind-mounted, so just copy it
createDirs(dirOf(target));
copyFile(std::filesystem::path(source), std::filesystem::path(target), false);
} else {
createDirs(dirOf(target));
writeFile(target, "");
bindMount();
}
}
struct LinuxDerivationBuilder : DerivationBuilderImpl struct LinuxDerivationBuilder : DerivationBuilderImpl
{ {
/** /**