From 1a81abb1ddb3fdc02a344624bef74710e31c0b73 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kristian=20H=C3=B8gsberg?= Date: Mon, 17 Jun 2013 15:23:20 -0400 Subject: [PATCH] weston-launch: Don't exit on SIGTERM Instead, forward signal to weston and wait for weston to clean up nicely. Weston relies on weston-launch being around to shut down correctly, so don't exit until we get the SIGCHLD from weston. This make killall weston-launch work properly. https://bugs.freedesktop.org/show_bug.cgi?id=62910 --- src/weston-launch.c | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/src/weston-launch.c b/src/weston-launch.c index de4e7058..76dcede3 100644 --- a/src/weston-launch.c +++ b/src/weston-launch.c @@ -453,13 +453,9 @@ handle_signal(struct weston_launch *wl) } break; case SIGTERM: - if (wl->child) - kill(wl->child, SIGTERM); - quit(wl, 0); - break; case SIGINT: if (wl->child) - kill(wl->child, SIGTERM); + kill(wl->child, sig.ssi_signo); break; default: return -1;