From: Tom Gundersen <teg@jklm.no>
Date: Tue, 2 Jun 2015 17:18:53 +0000 (+0200)
Subject: udevd: only bind ctrl and netlink sockets when we open them
X-Git-Tag: v221~203^2~6
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=bf6871639e25119cf3f8b414890d51e965ca3f97;p=thirdparty%2Fsystemd.git

udevd: only bind ctrl and netlink sockets when we open them

If they are passed from PID1 this is not necessary.
---

diff --git a/src/udev/udevd.c b/src/udev/udevd.c
index 1540f5c8f9d..ccdec3de439 100644
--- a/src/udev/udevd.c
+++ b/src/udev/udevd.c
@@ -1500,15 +1500,15 @@ static int manager_new(Manager **ret) {
                 fd_uevent = udev_monitor_get_fd(manager->monitor);
 
                 (void) udev_monitor_set_receive_buffer_size(manager->monitor, 128 * 1024 * 1024);
-        }
 
-        r = udev_monitor_enable_receiving(manager->monitor);
-        if (r < 0)
-                return log_error_errno(EINVAL, "error binding netlink socket");
+                r = udev_monitor_enable_receiving(manager->monitor);
+                if (r < 0)
+                        return log_error_errno(EINVAL, "error binding netlink socket");
 
-        r = udev_ctrl_enable_receiving(manager->ctrl);
-        if (r < 0)
-                return log_error_errno(EINVAL, "error binding udev control socket");
+                r = udev_ctrl_enable_receiving(manager->ctrl);
+                if (r < 0)
+                        return log_error_errno(EINVAL, "error binding udev control socket");
+        }
 
         *ret = manager;
         manager = NULL;