Revert "sd-device: do not call device_monitor_enable_receiving() for passed fd from...
authorYu Watanabe <watanabe.yu+github@gmail.com>
Sat, 8 Dec 2018 09:41:29 +0000 (18:41 +0900)
committerYu Watanabe <watanabe.yu+github@gmail.com>
Fri, 14 Dec 2018 00:24:31 +0000 (09:24 +0900)
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

index fcf9b76..623e004 100644 (file)
@@ -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;