diff options
| author | David Zeuthen <david@fubar.dk> | 2005-01-12 18:12:13 +0000 |
|---|---|---|
| committer | David Zeuthen <david@fubar.dk> | 2005-01-12 18:12:13 +0000 |
| commit | 869367455153923dd68312ee6681c8d795f1e7fe (patch) | |
| tree | eec180a2198d96a0cda3f71976700a0904cdea20 | |
| parent | 7530cf018fecef349bc158c49eec799fde912117 (diff) | |
Be tough and kill the misbehaving child the hard way - suggestion from Joe
Shaw.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | hald/callout.c | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -1,5 +1,10 @@ 2005-01-12 David Zeuthen <davidz@redhat.com> + * hald/callout.c (callout_timeout_handler): Be tough and kill + the misbehaving child the hard way - suggestion from Joe Shaw. + +2005-01-12 David Zeuthen <davidz@redhat.com> + * hald/linux/osspec.c (HOTPLUG_TIMEOUT): Increase to 25 seconds to better cope with callouts timeout of 10 seconds diff --git a/hald/callout.c b/hald/callout.c index 986d925f..dca494d0 100644 --- a/hald/callout.c +++ b/hald/callout.c @@ -217,8 +217,8 @@ callout_timeout_handler (gpointer data) HAL_WARNING (("Timeout (%d ms) for callout %s", CALLOUT_TIMEOUT, callout->filename)); - /* kill the child.. kill it! */ - kill (callout->pid, SIGTERM); + /* kill the child.. kill it the hard way */ + kill (callout->pid, SIGKILL); active_callout = NULL; |