shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-22 22:03:43 +03:00
Code

Revert "sd-device: do not call device_monitor_enable_receiving() for passed fd from pid1"

Browse Source 
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.
This commit is contained in:
Yu Watanabe 2018-12-08 18:41:29 +09:00
parent fd0ec39d38
commit a153a1de75
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/libsystemd/sd-device/device-monitor.c
View 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;