[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
350/376: Doh
From: |
Ludovic Courtès |
Subject: |
350/376: Doh |
Date: |
Wed, 28 Jan 2015 22:06:07 +0000 |
civodul pushed a commit to tag 1.8
in repository guix.
commit ad790022fddd5627eb237b95acae210c9b00c3de
Author: Eelco Dolstra <address@hidden>
Date: Fri Dec 12 13:41:00 2014 +0100
Doh
---
src/libstore/build.cc | 2 +-
src/libutil/util.cc | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index 36436d7..127fcfd 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -1918,7 +1918,7 @@ void DerivationGoal::startBuilder()
options.allowVfork = !buildUser.enabled();
pid = startProcess([&]() {
runChild();
- });
+ }, options);
/* parent */
pid.setSeparatePG(true);
diff --git a/src/libutil/util.cc b/src/libutil/util.cc
index 5895e72..a91cf26 100644
--- a/src/libutil/util.cc
+++ b/src/libutil/util.cc
@@ -850,7 +850,7 @@ void killUser(uid_t uid)
}
_exit(0);
- });
+ }, options);
int status = pid.wait(true);
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)
{
auto wrapper = [&]() {
- _writeToStderr = 0;
+ if (!options.allowVfork) _writeToStderr = 0;
try {
#if __linux__
if (options.dieWithParent && prctl(PR_SET_PDEATHSIG, SIGKILL) ==
-1)
- 339/376: Include cacert in the binary tarball, (continued)
- 339/376: Include cacert in the binary tarball, Ludovic Courtès, 2015/01/28
- 340/376: Rename function, Ludovic Courtès, 2015/01/28
- 342/376: Don't do vfork in conjunction with setuid, Ludovic Courtès, 2015/01/28
- 341/376: Use vfork, Ludovic Courtès, 2015/01/28
- 345/376: allow custom docbook paths/URLs, use a working URL for docbook.rng, Ludovic Courtès, 2015/01/28
- 344/376: Urgh, Ludovic Courtès, 2015/01/28
- 343/376: Provide default pagers, Ludovic Courtès, 2015/01/28
- 346/376: Don't use ?=, Ludovic Courtès, 2015/01/28
- 347/376: Remove canary stuff, Ludovic Courtès, 2015/01/28
- 348/376: Remove dead code, Ludovic Courtès, 2015/01/28
- 350/376: Doh,
Ludovic Courtès <=
- 338/376: Don't wait for PID -1, Ludovic Courtès, 2015/01/28
- 352/376: Get rid of unnecessary "interrupted by the user" message with -vvv, Ludovic Courtès, 2015/01/28
- 353/376: Don't abort if we get a signal while waiting for the pager, Ludovic Courtès, 2015/01/28
- 351/376: Remove chatty message, Ludovic Courtès, 2015/01/28
- 356/376: Shut up a Valgrind warning, Ludovic Courtès, 2015/01/28
- 349/376: Remove tabs, Ludovic Courtès, 2015/01/28
- 355/376: Fix some memory leaks, Ludovic Courtès, 2015/01/28
- 357/376: Silence some warnings on GCC 4.9, Ludovic Courtès, 2015/01/28
- 358/376: Install cacert before running nix-channel, Ludovic Courtès, 2015/01/28
- 359/376: Better error message, Ludovic Courtès, 2015/01/28