fdo-mirrors/plymouth
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/plymouth/plymouth.git synced 2026-05-07 04:58:00 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'timeout-on-pings' into 'master'

Browse source 
Don't wait forever for a ping reply.

See merge request plymouth/plymouth!124
This commit is contained in:
Ray Strode 2020-10-26 19:54:16 +00:00
commit a3798ec4c5
1 changed files with 9 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/client/plymouth.c
View file

@ -75,6 +75,13 @@ typedef struct
char *keys;
} key_answer_state_t;
ply_event_loop_timeout_handler_t timeout_handler(void *user_data)
{
ply_event_loop_t *loop = user_data;
ply_trace ("ping: timed out waiting for plymouthd");
ply_event_loop_exit(loop, 1);
}
static char **
split_string (const char *command,
const char delimiter)
@ -1145,6 +1152,8 @@ main (int argc,
on_success,
(ply_boot_client_response_handler_t)
on_failure, &state);
ply_event_loop_watch_for_timeout (state.loop, 30.0,
timeout_handler, state.loop);
} else if (should_check_for_active_vt) {
ply_boot_client_ask_daemon_has_active_vt (state.client,
(ply_boot_client_response_handler_t)