36 lines
1.3 KiB
Diff
36 lines
1.3 KiB
Diff
From: Colin Walters <walters@verbum.org>
|
|
Date: Wed, 11 Oct 2017 17:02:02 -0400
|
|
Subject: lib/deploy: Use _exit() for FIFREEZE watchdog
|
|
|
|
This works around an (IMO) SpiderMonkey bug - it tries to
|
|
clean up in a shared library destructor, but doesn't install a
|
|
`pthread_atfork()` handler to unset its state.
|
|
|
|
Closes: https://github.com/ostreedev/ostree/issues/1262
|
|
|
|
Closes: #1264
|
|
Approved by: dbnicholson
|
|
Origin: upstream, 2017.13, commit:8f6ec62bfb149ec8dfb6076228dd64e5df27a76b
|
|
---
|
|
src/libostree/ostree-sysroot-deploy.c | 7 ++++++-
|
|
1 file changed, 6 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/libostree/ostree-sysroot-deploy.c b/src/libostree/ostree-sysroot-deploy.c
|
|
index e37db39..d46d5c3 100644
|
|
--- a/src/libostree/ostree-sysroot-deploy.c
|
|
+++ b/src/libostree/ostree-sysroot-deploy.c
|
|
@@ -1291,7 +1291,12 @@ fsfreeze_thaw_cycle (OstreeSysroot *self,
|
|
}
|
|
if (debug_fifreeze)
|
|
g_printerr ("fifreeze watchdog was run\n");
|
|
- exit (EXIT_SUCCESS);
|
|
+ /* We use _exit() rather than exit() to avoid tripping over any shared
|
|
+ * libraries in process that aren't fork() safe; for example gjs/spidermonkey:
|
|
+ * https://github.com/ostreedev/ostree/issues/1262
|
|
+ * This doesn't help for the err()/errx() calls above, but eh...
|
|
+ */
|
|
+ _exit (EXIT_SUCCESS);
|
|
}
|
|
else /* Parent process. */
|
|
{
|