mainnika/weston
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

weston-launch: Unblock our signalfd signals before execing child

Browse Source 
Giovanni Campagna ran into this with mutter.
This commit is contained in:
Kristian Høgsberg
2013-07-30 09:45:04 -07:00
parent c30c4bd6c8
commit 73c60ab6e9
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/weston-launch.c
+8
View File
@@ -542,6 +542,7 @@ static void
launch_compositor(struct weston_launch *wl, int argc, char *argv[]) launch_compositor(struct weston_launch *wl, int argc, char *argv[])
{ {
char *child_argv[MAX_ARGV_SIZE]; char *child_argv[MAX_ARGV_SIZE];
sigset_t allsigs;
int i; int i;
if (wl->verbose) if (wl->verbose)
@@ -556,6 +557,13 @@ launch_compositor(struct weston_launch *wl, int argc, char *argv[])
unsetenv("DISPLAY"); unsetenv("DISPLAY");
/* Do not give our signal mask to the new process. */
sigemptyset(&mask);
sigaddset(&mask, SIGTERM);
sigaddset(&mask, SIGCHLD);
sigaddset(&mask, SIGINT);
sigprocmask(SIG_UNBLOCK, &mask, NULL);
child_argv[0] = wl->pw->pw_shell; child_argv[0] = wl->pw->pw_shell;
child_argv[1] = "-l"; child_argv[1] = "-l";
child_argv[2] = "-c"; child_argv[2] = "-c";