civodul pushed a commit to tag 1.8
in repository guix.
commit 029424d17d0860e4423bbd409f22104f55ea65e0
Author: Eelco Dolstra <[email protected]>
Date: Tue Aug 19 17:44:59 2014 +0200
Make hook shutdown more reliable
---
src/libstore/build.cc | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/src/libstore/build.cc b/src/libstore/build.cc
index 232059e..aa539a1 100644
--- a/src/libstore/build.cc
+++ b/src/libstore/build.cc
@@ -617,7 +617,6 @@ HookInstance::HookInstance()
});
pid.setSeparatePG(true);
- pid.setKillSignal(SIGTERM);
fromHook.writeSide.close();
toHook.readSide.close();
}
@@ -626,6 +625,7 @@ HookInstance::HookInstance()
HookInstance::~HookInstance()
{
try {
+ toHook.writeSide.close();
pid.kill(true);
} catch (...) {
ignoreException();