From a153a1de757c1b85a3493c1581f45413b9782a3c Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Sat, 8 Dec 2018 18:41:29 +0900 Subject: [PATCH] Revert "sd-device: do not call device_monitor_enable_receiving() for passed fd from pid1" This reverts commit 916707cca56ac73c81d10c41b6d7f0800663fc29. As the CI results on #11076, #10754 is not fixed by the commit, but by 986ab0d2dc161dfa026e8fc7a609f9efb8cb4397. So, let's revert the commit. --- src/libsystemd/sd-device/device-monitor.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/src/libsystemd/sd-device/device-monitor.c b/src/libsystemd/sd-device/device-monitor.c index fcf9b761ee..623e004fed 100644 --- a/src/libsystemd/sd-device/device-monitor.c +++ b/src/libsystemd/sd-device/device-monitor.c @@ -211,11 +211,9 @@ _public_ int sd_device_monitor_start(sd_device_monitor *m, sd_device_monitor_han return r; } - if (!m->bound) { - r = device_monitor_enable_receiving(m); - if (r < 0) - return r; - } + r = device_monitor_enable_receiving(m); + if (r < 0) + return r; m->callback = callback; m->userdata = userdata; -- 2.25.1