X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fnetwork%2Fnetworkd.c;h=723d10547cd4c57713393cea08f582333d738b58;hb=113b3fc1a8061f4a24dd0db74e9a3cd0083b2251;hp=430d615f90753066b61a260e25457860abd0903c;hpb=c33b329709ebe2755181980a050d02ec7c81ed87;p=elogind.git

diff --git a/src/network/networkd.c b/src/network/networkd.c
index 430d615f9..723d10547 100644
--- a/src/network/networkd.c
+++ b/src/network/networkd.c
@@ -20,7 +20,6 @@
 ***/
 
 #include "capability.h"
-#include "sd-event.h"
 #include "sd-daemon.h"
 
 #include "networkd.h"
@@ -64,6 +63,12 @@ int main(int argc, char *argv[]) {
         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) |
@@ -80,41 +85,37 @@ int main(int argc, char *argv[]) {
                 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);
+        r = manager_connect_bus(m);
         if (r < 0) {
-                log_error_errno(r, "Could not connect to rtnl: %m");
+                log_error_errno(r, "Could not connect to bus: %m");
                 goto out;
         }
 
-        r = manager_bus_listen(m);
+        r = manager_load_config(m);
         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;
         }
 
-        r = manager_load_config(m);
+        r = manager_rtnl_enumerate_links(m);
         if (r < 0) {
-                log_error_errno(r, "Could not load configuration files: %m");
+                log_error_errno(r, "Could not enumerate links: %m");
                 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;
         }
 
+        log_info("Enumeration completed");
+
         sd_notify(false,
                   "READY=1\n"
                   "STATUS=Processing requests...");
 
-        r = sd_event_loop(m->event);
+        r = manager_run(m);
         if (r < 0) {
                 log_error_errno(r, "Event loop failed: %m");
                 goto out;