mdebray/tvl-depot
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Doh

Browse source
This commit is contained in:
Eelco Dolstra 2014-12-12 13:41:00 +01:00
parent dcdb254281
commit ad790022fd
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/libstore/build.cc
View file

@ -1918,7 +1918,7 @@ void DerivationGoal::startBuilder()
options.allowVfork = !buildUser.enabled(); options.allowVfork = !buildUser.enabled();
pid = startProcess([&]() { pid = startProcess([&]() {
runChild(); runChild();
}); }, options);
/* parent */ /* parent */
pid.setSeparatePG(true); pid.setSeparatePG(true);

4
src/libutil/util.cc
View file

@ -850,7 +850,7 @@ void killUser(uid_t uid)
} }
_exit(0); _exit(0);
}); }, options);
int status = pid.wait(true); int status = pid.wait(true);
if (status != 0) if (status != 0)
@ -885,7 +885,7 @@ static pid_t doFork(bool allowVfork, std::function<void()> fun)
pid_t startProcess(std::function<void()> fun, const ProcessOptions & options) pid_t startProcess(std::function<void()> fun, const ProcessOptions & options)
{ {
auto wrapper = [&]() { auto wrapper = [&]() {
_writeToStderr = 0; if (!options.allowVfork) _writeToStderr = 0;
try { try {
#if __linux__ #if __linux__
if (options.dieWithParent && prctl(PR_SET_PDEATHSIG, SIGKILL) == -1) if (options.dieWithParent && prctl(PR_SET_PDEATHSIG, SIGKILL) == -1)