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

Call commonChildInit() before doing chroot init

Browse source 
This ensures that daemon clients see error messages from the chroot
setup.
This commit is contained in:
Eelco Dolstra 2014-08-01 19:29:03 +02:00
parent eea0401d7a
commit 4c4b219c07
2 changed files with 16 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/libstore/build.cc
View file

@ -374,8 +374,6 @@ void Goal::trace(const format & f)
/* Common initialisation performed in child processes. */
static void commonChildInit(Pipe & logPipe)
{
restoreAffinity();
/* Put the child in a separate session (and thus a separate
process group) so that it has no controlling terminal (meaning
that e.g. ssh cannot open /dev/tty) and it doesn't receive
@ -1962,6 +1960,12 @@ void DerivationGoal::initChild()
try { /* child */
_writeToStderr = 0;
restoreAffinity();
commonChildInit(builderOut);
#if CHROOT_ENABLED
if (useChroot) {
/* Initialise the loopback interface. */
@ -2080,8 +2084,6 @@ void DerivationGoal::initChild()
}
#endif
commonChildInit(builderOut);
if (chdir(tmpDir.c_str()) == -1)
throw SysError(format("changing into `%1%'") % tmpDir);

18
src/libutil/util.cc
View file

@ -466,10 +466,18 @@ void warnOnce(bool & haveWarned, const FormatOrString & fs)
}
static void defaultWriteToStderr(const unsigned char * buf, size_t count)
{
writeFull(STDERR_FILENO, buf, count);
}
void writeToStderr(const string & s)
{
try {
_writeToStderr((const unsigned char *) s.data(), s.size());
auto p = _writeToStderr;
if (!p) p = defaultWriteToStderr;
p((const unsigned char *) s.data(), s.size());
} catch (SysError & e) {
/* Ignore failing writes to stderr if we're in an exception
handler, otherwise throw an exception. We need to ignore
@ -481,12 +489,6 @@ void writeToStderr(const string & s)
}
static void defaultWriteToStderr(const unsigned char * buf, size_t count)
{
writeFull(STDERR_FILENO, buf, count);
}
void (*_writeToStderr) (const unsigned char * buf, size_t count) = defaultWriteToStderr;
@ -849,7 +851,7 @@ pid_t startProcess(std::function<void()> fun, const string & errorPrefix)
if (pid == -1) throw SysError("unable to fork");
if (pid == 0) {
_writeToStderr = defaultWriteToStderr;
_writeToStderr = 0;
try {
restoreAffinity();
fun();