diff options
| author | Adam Joseph <adam@westernsemico.com> | 2022-07-19 03:33:12 -0700 |
|---|---|---|
| committer | Adam Joseph <adam@westernsemico.com> | 2022-07-19 03:33:12 -0700 |
| commit | 99fcc91f67ece5a9646065665395f496d6a0cb84 (patch) | |
| tree | 6e9ec8b7c2c89ab3ba1f97212043635cd6b94b6c | |
| parent | 5f51539f88227285866843f1383fd47d80fd5918 (diff) | |
as requested by @thufschmitt https://github.com/NixOS/nix/pull/6814#discussion_r924275777
| -rw-r--r-- | src/libstore/build/local-derivation-goal.cc | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/libstore/build/local-derivation-goal.cc b/src/libstore/build/local-derivation-goal.cc index 595149f0a..43df41e34 100644 --- a/src/libstore/build/local-derivation-goal.cc +++ b/src/libstore/build/local-derivation-goal.cc @@ -855,11 +855,6 @@ void LocalDerivationGoal::startBuilder() switch(errno) { case EPERM: case EINVAL: { - /* Otherwise exit with EPERM so we can handle this in the - parent. This is only done when sandbox-fallback is set - to true (the default). */ - if (settings.sandboxFallback) - _exit(1); if (!userNamespacesEnabled && errno==EPERM) notice("user namespaces appear to be disabled; they are required for sandboxing; check /proc/sys/user/max_user_namespaces"); if (userNamespacesEnabled) { @@ -872,6 +867,11 @@ void LocalDerivationGoal::startBuilder() Path procSelfNsUser = "/proc/self/ns/user"; if (!pathExists(procSelfNsUser)) notice("/proc/self/ns/user does not exist; your kernel was likely built without CONFIG_USER_NS=y, which is required for sandboxing"); + /* Otherwise exit with EPERM so we can handle this in the + parent. This is only done when sandbox-fallback is set + to true (the default). */ + if (settings.sandboxFallback) + _exit(1); /* Mention sandbox-fallback in the error message so the user knows that having it disabled contributed to the unrecoverability of this failure */ |