zebreus/lix
0
0
Fork 0
forked from lix-project/lix
Code Pull requests 1 Activity

Don’t rely on EPERM

Browse source 
startProcess does not appear to send the exit code to the helper
correctly. Not sure why this is, but it is probably safe to just
fallback on all sandbox errors.
This commit is contained in:
Matthew Bauer 2019-07-30 17:52:42 -04:00
parent 11d8534629
commit 9a0855bbb6
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/libstore/build.cc
View file

@ -2320,7 +2320,7 @@ void DerivationGoal::startBuilder()
parent. This is only done when sandbox-fallback is set parent. This is only done when sandbox-fallback is set
to true (the default). */ to true (the default). */
if (child == -1 && (errno == EPERM || errno == EINVAL) && settings.sandboxFallback) if (child == -1 && (errno == EPERM || errno == EINVAL) && settings.sandboxFallback)
_exit(EPERM); _exit(1);
if (child == -1) throw SysError("cloning builder process"); if (child == -1) throw SysError("cloning builder process");
writeFull(builderOut.writeSide.get(), std::to_string(child) + "\n"); writeFull(builderOut.writeSide.get(), std::to_string(child) + "\n");
@ -2328,7 +2328,7 @@ void DerivationGoal::startBuilder()
}, options); }, options);
int res = helper.wait(); int res = helper.wait();
if (res == EPERM && settings.sandboxFallback) { if (res != 0 && settings.sandboxFallback) {
useChroot = false; useChroot = false;
goto fallback; goto fallback;
} else if (res != 0) } else if (res != 0)