diff options
author | Yu Watanabe <watanabe.yu+github@gmail.com> | 2019-09-18 08:15:01 +0900 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-18 08:15:01 +0900 |
commit | 5a4717fe8e6aef06cbb532862ad55bc3280eff42 (patch) | |
tree | b9d6371fb062305e1095ca5aa97803599dff4fb7 /src/udev/udev-ctrl.c | |
parent | 62080133da886fb18e186cc481e542b8a8e7ab00 (diff) | |
parent | ce8a4ef13d48d27741e222d7474cd778b3a70bd2 (diff) | |
download | systemd-5a4717fe8e6aef06cbb532862ad55bc3280eff42.tar.gz |
Merge pull request #13582 from yuwata/udevadm-reload
udevadm: use 'udevadm control' to reload udevd
Diffstat (limited to 'src/udev/udev-ctrl.c')
-rw-r--r-- | src/udev/udev-ctrl.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/udev/udev-ctrl.c b/src/udev/udev-ctrl.c index b38370883f..f1befc7304 100644 --- a/src/udev/udev-ctrl.c +++ b/src/udev/udev-ctrl.c @@ -76,6 +76,7 @@ int udev_ctrl_new_from_fd(struct udev_ctrl **ret, int fd) { *uctrl = (struct udev_ctrl) { .n_ref = 1, .sock = fd >= 0 ? fd : TAKE_FD(sock), + .sock_connect = -1, .bound = fd >= 0, }; @@ -394,14 +395,13 @@ int udev_ctrl_wait(struct udev_ctrl *uctrl, usec_t timeout) { (void) sd_event_source_set_description(source_io, "udev-ctrl-wait-io"); if (timeout != USEC_INFINITY) { - usec_t usec; - - usec = now(clock_boottime_or_monotonic()) + timeout; - r = sd_event_add_time(uctrl->event, &source_timeout, clock_boottime_or_monotonic(), usec, 0, NULL, INT_TO_PTR(-ETIMEDOUT)); + r = sd_event_add_time(uctrl->event, &source_timeout, clock_boottime_or_monotonic(), + usec_add(now(clock_boottime_or_monotonic()), timeout), + 0, NULL, INT_TO_PTR(-ETIMEDOUT)); if (r < 0) return r; - (void) sd_event_source_set_description(source_timeout, "udev-ctrl-wait-io"); + (void) sd_event_source_set_description(source_timeout, "udev-ctrl-wait-timeout"); } return sd_event_loop(uctrl->event); |