From: Yu Watanabe <watanabe.yu+github@gmail.com>
Date: Sat, 8 Dec 2018 09:41:29 +0000 (+0900)
Subject: Revert "sd-device: do not call device_monitor_enable_receiving() for passed fd from... 
X-Git-Tag: v240~42^2~2
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=a153a1de757c1b85a3493c1581f45413b9782a3c;p=thirdparty%2Fsystemd.git

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.
---

diff --git a/src/libsystemd/sd-device/device-monitor.c b/src/libsystemd/sd-device/device-monitor.c
index fcf9b761ee9..623e004fedf 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;