networkd: refactor socket activation a bit

[elogind.git] / src / network / networkd.c

diff --git a/src/network/networkd.c b/src/network/networkd.c
index 430d615f90753066b61a260e25457860abd0903c..0b4af9067717a4d29b0a43ff44a0bbef6f768660 100644 (file)
--- a/src/network/networkd.c
+++ b/src/network/networkd.c
@@ -64,6 +64,12 @@ int main(int argc, char *argv[]) {
         if (r < 0)
                 log_error_errno(r, "Could not create runtime directory 'leases': %m");
 
         if (r < 0)
                 log_error_errno(r, "Could not create runtime directory 'leases': %m");
 

+        r = mkdir_safe_label("/run/systemd/netif/lldp", 0755, uid, gid);
+        if (r < 0)
+                log_error("Could not create runtime directory 'lldp': %s",
+                          strerror(-r));
+
+

         r = drop_privileges(uid, gid,
                             (1ULL << CAP_NET_ADMIN) |
                             (1ULL << CAP_NET_BIND_SERVICE) |
         r = drop_privileges(uid, gid,
                             (1ULL << CAP_NET_ADMIN) |
                             (1ULL << CAP_NET_BIND_SERVICE) |


@@ -80,31 +86,19 @@ int main(int argc, char *argv[]) {
                 goto out;
         }
 
                 goto out;
         }
 

-        r = manager_udev_listen(m);
-        if (r < 0) {
-                log_error_errno(r, "Could not connect to udev: %m");
-                goto out;
-        }
-
-        r = manager_rtnl_listen(m);
-        if (r < 0) {
-                log_error_errno(r, "Could not connect to rtnl: %m");
-                goto out;
-        }
-
-        r = manager_bus_listen(m);
+        r = manager_load_config(m);

         if (r < 0) {
         if (r < 0) {

-                log_error_errno(r, "Could not connect to system bus: %m");
+                log_error_errno(r, "Could not load configuration files: %m");

                 goto out;
         }
 
                 goto out;
         }
 

-        r = manager_load_config(m);
+        r = manager_rtnl_enumerate_links(m);

         if (r < 0) {
         if (r < 0) {

-                log_error_errno(r, "Could not load configuration files: %m");
+                log_error_errno(r, "Could not enumerate links: %m");

                 goto out;
         }
 
                 goto out;
         }
 

-        r = manager_rtnl_enumerate_links(m);
+        r = manager_rtnl_enumerate_addresses(m);

         if (r < 0) {
                 log_error_errno(r, "Could not enumerate links: %m");
                 goto out;
         if (r < 0) {
                 log_error_errno(r, "Could not enumerate links: %m");
                 goto out;