lix-project/lix
20
57
Fork 31
Code Issues 350 Code Review (Gerrit) Projects 3 Releases Wiki Activity

Merge "Fix namespace warning being emitted if sandbox is disabled" into main

Browse source
This commit is contained in:
Winter Cute 2024-07-20 22:14:33 +00:00 committed by Gerrit Code Review
parent 72ee25b402 3da41fdb82
commit 1917e6c765
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libstore/build/local-derivation-goal.cc
View file

@ -221,12 +221,12 @@ void LocalDerivationGoal::tryLocalBuild()
} }
#if __linux__ #if __linux__
if (useChroot) {
// FIXME: should user namespaces being unsupported also require // FIXME: should user namespaces being unsupported also require
// sandbox-fallback to be allowed? I don't think so, since they aren't a // sandbox-fallback to be allowed? I don't think so, since they aren't a
// huge security win to have enabled. // huge security win to have enabled.
usingUserNamespace = userNamespacesSupported(); usingUserNamespace = userNamespacesSupported();
if (useChroot) {
if (!mountAndPidNamespacesSupported()) { if (!mountAndPidNamespacesSupported()) {
if (!settings.sandboxFallback) 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."); 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.");