fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-03-25 09:30:43 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

dispatcher: repeat waitpid() call on EINTR

Browse source 
Also, no use of first trying to kill() with signal zero. Just
send SIGKILL right away.
This commit is contained in:
Thomas Haller 2015-05-03 13:57:16 +02:00
parent 5f0c23f106
commit 22bfe2feb2
1 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
callouts/nm-dispatcher.c
View file

@ -294,9 +294,12 @@ script_timeout_cb (gpointer user_data)
g_warning ("Script '%s' took too long; killing it.", script->script);
if (kill (script->pid, 0) == 0)
kill (script->pid, SIGKILL);
(void) waitpid (script->pid, NULL, 0);
kill (script->pid, SIGKILL);
again:
if (waitpid (script->pid, NULL, 0) == -1) {
if (errno == EINTR)
goto again;
}
script->error = g_strdup_printf ("Script '%s' timed out.", script->script);
script->result = DISPATCH_RESULT_TIMEOUT;