udevd: do not call udev_ctrl_enable_receiving() if the socket is passed from pid1
Before c4b69e990f
, if the socket fd is
passed from pid1, `udev_ctrl_enable_receiving()` was not called.
Let's preserve the original logic.
This commit is contained in:
parent
986ab0d2dc
commit
6acf1ccba5
|
@ -1617,9 +1617,11 @@ static int manager_new(Manager **ret, int fd_ctrl, int fd_uevent, const char *cg
|
||||||
if (!manager->ctrl)
|
if (!manager->ctrl)
|
||||||
return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Failed to initialize udev control socket");
|
return log_error_errno(SYNTHETIC_ERRNO(EINVAL), "Failed to initialize udev control socket");
|
||||||
|
|
||||||
r = udev_ctrl_enable_receiving(manager->ctrl);
|
if (fd_ctrl < 0) {
|
||||||
if (r < 0)
|
r = udev_ctrl_enable_receiving(manager->ctrl);
|
||||||
return log_error_errno(r, "Failed to bind udev control socket: %m");
|
if (r < 0)
|
||||||
|
return log_error_errno(r, "Failed to bind udev control socket: %m");
|
||||||
|
}
|
||||||
|
|
||||||
fd_ctrl = udev_ctrl_get_fd(manager->ctrl);
|
fd_ctrl = udev_ctrl_get_fd(manager->ctrl);
|
||||||
if (fd_ctrl < 0)
|
if (fd_ctrl < 0)
|
||||||
|
|
Loading…
Reference in a new issue