diff options
| author | Winter <winter@winter.cafe> | 2024-07-19 14:36:10 -0400 |
|---|---|---|
| committer | Winter <winter@winter.cafe> | 2024-07-19 19:14:54 -0400 |
| commit | 3da41fdb829c2b2085cf9c9ae268f3bee5d5594f (patch) | |
| tree | 88ebdec171a3ac906249f2a3860ab37f222a5d3a /src/libstore/build | |
| parent | aba5f19680b2f4c29d7ce2ff5e2a89128c1cb26d (diff) | |
Fix namespace warning being emitted if sandbox is disabled
If useChroot = false, and user namespaces aren't available for some
reason (e.g. within a Docker container), this fixes a pointless warning
being emitted, as we would never attempt to use them even if they were
available.
Change-Id: Ibcee91c088edd2cd19e70218d5a5802bff8f537b
Diffstat (limited to 'src/libstore/build')
| -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 5ca8eac95..660512e49 100644 --- a/src/libstore/build/local-derivation-goal.cc +++ b/src/libstore/build/local-derivation-goal.cc @@ -221,12 +221,12 @@ void LocalDerivationGoal::tryLocalBuild() } #if __linux__ - // FIXME: should user namespaces being unsupported also require - // sandbox-fallback to be allowed? I don't think so, since they aren't a - // huge security win to have enabled. - usingUserNamespace = userNamespacesSupported(); - if (useChroot) { + // FIXME: should user namespaces being unsupported also require + // sandbox-fallback to be allowed? I don't think so, since they aren't a + // huge security win to have enabled. + usingUserNamespace = userNamespacesSupported(); + if (!mountAndPidNamespacesSupported()) { if (!settings.sandboxFallback) throw Error("this system does not support the kernel namespaces that are required for sandboxing; use '--no-sandbox' to disable sandboxing. Pass --debug for diagnostics on what is broken."); |