From 78467aeb9578bee56211a64190b3293616647aee Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sat, 26 Jan 2019 00:33:08 +0900 Subject: udev-ctrl: split out logic of waiting for reply to udev_ctrl_wait() This makes `udevadm control` can send multiple commands in one connection. --- src/udev/udevadm-trigger.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'src/udev/udevadm-trigger.c') diff --git a/src/udev/udevadm-trigger.c b/src/udev/udevadm-trigger.c index 14c70e4009..63ceaaf957 100644 --- a/src/udev/udevadm-trigger.c +++ b/src/udev/udevadm-trigger.c @@ -312,9 +312,13 @@ int trigger_main(int argc, char *argv[], void *userdata) { if (r < 0) return log_error_errno(r, "Failed to initialize udev control: %m"); - r = udev_ctrl_send_ping(uctrl, ping_timeout_usec); + r = udev_ctrl_send_ping(uctrl); if (r < 0) return log_error_errno(r, "Failed to connect to udev daemon: %m"); + + r = udev_ctrl_wait(uctrl, ping_timeout_usec); + if (r < 0) + return log_error_errno(r, "Failed to wait for daemon to reply: %m"); } for (; optind < argc; optind++) { -- cgit v1.2.1